=== modified file '.bzrignore'
--- .bzrignore	2011-11-14 16:02:32 +0000
+++ .bzrignore	2012-05-04 09:55:18 +0000
@@ -18,3 +18,4 @@
 *.ipr
 *.ids
 *.iws
+overlays/

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2012-04-22 20:14:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2012-05-04 09:55:18 +0000
@@ -153,7 +153,7 @@
      * @param comment
      */
     public OrganisationUnit( String name, String shortName, String code, Date openingDate, Date closedDate,
-                             boolean active, String comment )
+        boolean active, String comment )
     {
         this.name = name;
         this.shortName = shortName;
@@ -174,7 +174,7 @@
      * @param comment
      */
     public OrganisationUnit( String name, OrganisationUnit parent, String shortName, String code, Date openingDate,
-                             Date closedDate, boolean active, String comment )
+        Date closedDate, boolean active, String comment )
     {
         this.name = name;
         this.parent = parent;

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2012-04-25 14:01:07 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2012-05-04 09:55:18 +0000
@@ -86,7 +86,7 @@
 
         Date startDate = new Date();
 
-        log.info( "User " + currentUserService.getCurrentUsername() + " started import at " + startDate );
+        log.info( "User '" + currentUserService.getCurrentUsername() + "' started import at " + startDate );
 
         doImport( metaData.getOrganisationUnits(), importOptions, importSummary );
         doImport( metaData.getOrganisationUnitLevels(), importOptions, importSummary );