Merge commit 'libreoffice-3.4.0.2'

Conflicts:
	sal/osl/unx/diagnose.c

sal/osl/unx/diagnose.c

@@ -255,7 +255,7 @@ sal_Bool SAL_CALL osl_assertFailedLine (
     /* output message buffer */
     OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
 
-    /* output backtrace */
+    /* should we output backtrace? */
     char const * envBacktrace = getenv( "SAL_DIAGNOSE_BACKTRACE" );
     if( envBacktrace != NULL && *envBacktrace != '\0' )
         osl_diagnose_backtrace_Impl(f);

sal/qa/osl/security/osl_Security.cxx

@@ -368,8 +368,11 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
 
     /// get home directory;
+    char *pw_dir = pw->pw_dir;
+    if( getenv( "FAKEROOTKEY" ) )
+        pw_dir = getenv("HOME");
     CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",
-                            ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw->pw_dir ), strHomeDirectory ) );
+                            ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
 
     /// get config directory;
     strConfigDirectory = strHomeDirectory.copy(0);