[gnome-main-menu/gnome-3: 6/6] Merge remote branch 'origin/gnome-3' into gnome-3

[Michael Meeks <michael src gnome org>]

commit 52f85473c279c07ddff688b29938f5bfada3b0d6
Merge: 33c4a4a ea0b499
Author: Michael Meeks <michael meeks suse com>
Date:   Mon Sep 26 15:50:51 2011 +0100

    Merge remote branch 'origin/gnome-3' into gnome-3
    
    Conflicts:
    	main-menu/src/hard-drive-status-tile.c
    	main-menu/src/main-menu-migration.c
    	main-menu/src/main-menu-ui.c

 main-menu/src/main-menu-migration.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc main-menu/src/main-menu-migration.c
index caf0e11,cbf505f..b4e8fce
--- a/main-menu/src/main-menu-migration.c
+++ b/main-menu/src/main-menu-migration.c
@@@ -69,7 -69,7 +69,7 @@@ move_system_area_to_new_set (
  			g_object_unref (filestream);
  		g_object_unref (file);
  		g_free (filename);
--		
++
  		filename = g_build_filename (
  			g_get_user_data_dir (), PACKAGE, SYSTEM_BOOKMARK_FILENAME, NULL);
  		if (g_file_test (filename, G_FILE_TEST_EXISTS))