Merge lp://qastaging/~didrocks/unity/fix-gerror-import into lp://qastaging/unity

Text conflict in dash/DashController.cpp
Text conflict in dash/DashView.cpp
Text conflict in dash/PlacesGroup.cpp
Text conflict in dash/ResultViewGrid.cpp
Text conflict in dash/ResultViewGrid.h
Text conflict in hud/HudButton.cpp
Text conflict in hud/HudButton.h
Text conflict in hud/HudController.cpp
Text conflict in hud/HudController.h
Path conflict: hud/HudPrivate.cpp / plugins/unityshell/src/HudPrivate.cpp
Path conflict: hud/HudPrivate.h / plugins/unityshell/src/HudPrivate.h
Text conflict in hud/HudView.cpp
Text conflict in hud/HudView.h
Text conflict in launcher/BamfLauncherIcon.cpp
Text conflict in launcher/BamfLauncherIcon.h
Text conflict in launcher/DeviceLauncherIcon.cpp
Text conflict in launcher/DeviceLauncherIcon.h
Text conflict in launcher/DeviceLauncherSection.cpp
Text conflict in launcher/DeviceLauncherSection.h
Text conflict in launcher/Launcher.cpp
Text conflict in launcher/Launcher.h
Text conflict in launcher/LauncherController.cpp
Text conflict in launcher/LauncherIcon.cpp
Text conflict in launcher/QuicklistView.cpp
Text conflict in launcher/StandaloneLauncher.cpp
Text conflict in launcher/SwitcherController.cpp
Text conflict in launcher/SwitcherView.h
Text conflict in manual-tests/Dash.txt
Text conflict in manual-tests/Launcher.txt
Text conflict in plugins/unityshell/src/ScreenEffectFramebufferObject.cpp
Text conflict in plugins/unityshell/src/compizminimizedwindowhandler.h
Text conflict in plugins/unityshell/src/unityshell.cpp
Text conflict in plugins/unityshell/src/unityshell.h
Conflict adding files to standalone-clients.  Created directory.
Conflict because standalone-clients is not versioned, but has versioned children.  Versioned directory.
Contents conflict in standalone-clients/CMakeLists.txt
Text conflict in tests/CMakeLists.txt
Conflict adding files to tests/autopilot/autopilot.  Created directory.
Conflict because tests/autopilot/autopilot is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to tests/autopilot/autopilot/emulators.  Created directory.
Conflict because tests/autopilot/autopilot/emulators is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tests/autopilot/autopilot/emulators/bamf.py
Contents conflict in tests/autopilot/autopilot/keybindings.py
Contents conflict in tests/autopilot/autopilot/utilities.py
Text conflict in tests/autopilot/unity/emulators/__init__.py
Text conflict in tests/autopilot/unity/emulators/dash.py
Text conflict in tests/autopilot/unity/emulators/icons.py
Text conflict in tests/autopilot/unity/emulators/launcher.py
Text conflict in tests/autopilot/unity/emulators/tooltip.py
Text conflict in tests/autopilot/unity/emulators/window_manager.py
Text conflict in tests/autopilot/unity/tests/__init__.py
Text conflict in tests/autopilot/unity/tests/test_command_lens.py
Text conflict in tests/autopilot/unity/tests/test_dash.py
Text conflict in tests/autopilot/unity/tests/test_home_lens.py
Text conflict in tests/autopilot/unity/tests/test_hud.py
Text conflict in tests/autopilot/unity/tests/test_ibus.py
Contents conflict in tests/autopilot/unity/tests/test_launcher.py
Text conflict in tests/autopilot/unity/tests/test_panel.py
Text conflict in tests/autopilot/unity/tests/test_quicklist.py
Text conflict in tests/autopilot/unity/tests/test_shortcut_hint.py
Text conflict in tests/autopilot/unity/tests/test_switcher.py
Text conflict in tests/test_hud_button.cpp
Conflict adding file tests/test_hud_controller.cpp.  Moved existing file to tests/test_hud_controller.cpp.moved.
Text conflict in tests/test_hud_private.cpp
Conflict adding file tests/test_hud_view.cpp.  Moved existing file to tests/test_hud_view.cpp.moved.
Text conflict in tests/test_im_text_entry.cpp
Text conflict in tests/test_main.cpp
Conflict adding file tests/test_resultviewgrid.cpp.  Moved existing file to tests/test_resultviewgrid.cpp.moved.
Text conflict in unity-shared/IMTextEntry.cpp
Text conflict in unity-shared/IconTexture.h
Text conflict in unity-shared/OverlayRenderer.cpp
Text conflict in unity-shared/PluginAdapterCompiz.cpp
Text conflict in unity-shared/SearchBar.cpp
Text conflict in unity-shared/StaticCairoText.cpp
Text conflict in unity-shared/StaticCairoText.h
Text conflict in unity-shared/UBusMessages.h
Text conflict in unity-shared/UScreen.cpp
Text conflict in unity-shared/UScreen.h
Text conflict in unity-shared/UnityWindowView.h
Text conflict in unity-shared/WindowManager.cpp
Text conflict in unity-shared/WindowManager.h