Merge commit 'refs/pull/31/head' of https://github.com/apache/logging-log4cxx into master
diff --git a/build.xml b/build.xml
index 6e1a811..a49280e 100644
--- a/build.xml
+++ b/build.xml
@@ -432,7 +432,7 @@
 			Is allowed to fail in case of no files to delete:
 
 			[exec] svn: E205001: Try 'svn help delete' for more information
-     		[exec] svn: E205001: Not enough arguments provided
+			[exec] svn: E205001: Not enough arguments provided
 		 -->
 		<exec	executable="sh"
 				failonerror="false">
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2e64860..4e7166d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -97,6 +97,7 @@
 			<action issue="LOGCXX-277" type="fix">Reconnection not working for sockets</action>
 			<action issue="LOGCXX-276" type="fix">AndFilter and others defined but not implemented</action>
 			<action issue="LOGCXX-275" type="fix">Headers cannot be included with very strict warning settings</action>
+			<action issue="LOGCXX-273" type="fix">Prevent filenamepatterntestcase from failing in some timezones</action>
 			<action issue="LOGCXX-272" type="update">Apache log4cxx 0.11.0 release</action>
 			<action issue="LOGCXX-271" type="fix">MDC::put will not overwrite existing key value pair</action>
 			<action issue="LOGCXX-270" type="fix">Add ability to compile out logging by logging level.</action>
diff --git a/src/site/site.xml b/src/site/site.xml
index 721a7a4..2fd8154 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -111,18 +111,18 @@
 			/>
 			<item	name="Building"
 					href="/building/index.html">
-				<item	name="autotools"
-						href="/building/autotools.html"
-				/>
 				<item	name="Apache Maven 2"
 						href="/building/maven.html"
 				/>
-				<item	name="Microsoft vcpkg"
-						href="/building/vcpkg.html"
+				<item	name="Autotools"
+						href="/building/autotools.html"
 				/>
 				<item	name="CMake"
 						href="/building/cmake.html"
 				/>
+				<item	name="Microsoft vcpkg"
+						href="/building/vcpkg.html"
+				/>
 			</item>
 		</menu>
 
diff --git a/src/test/cpp/rolling/filenamepatterntestcase.cpp b/src/test/cpp/rolling/filenamepatterntestcase.cpp
index e703f50..eb29cbb 100644
--- a/src/test/cpp/rolling/filenamepatterntestcase.cpp
+++ b/src/test/cpp/rolling/filenamepatterntestcase.cpp
@@ -99,13 +99,14 @@
 	{
 		apr_time_exp_t tm;
 		memset(&tm, 0, sizeof(tm));
+		apr_time_exp_lt(&tm, 0); // set tm_gmtoff
 		tm.tm_min = min;
 		tm.tm_hour = hour;
 		tm.tm_mday = day;
 		tm.tm_mon = month;
 		tm.tm_year = year - 1900;
 		apr_time_t n;
-		/*apr_status_t stat = */apr_time_exp_get(&n, &tm);
+		apr_time_exp_gmt_get(&n, &tm);
 		ObjectPtr obj(new Date(n));
 		LOGUNIT_ASSERT_EQUAL(expected, format(pattern, obj));
 	}