Merge commit '3516a3ac56ef222f3995a49ee429eebb48526408' into nemo_master_merge

Does not compile, because of pending rename

Conflicts:
	.gitignore
	configure.in
	libnemo-private/Makefile.am
	libnemo-private/nemo-directory-async.c
	libnemo-private/nemo-directory.c
	po/sr.po
	po/sr@latin.po
	src/nemo-application.c
	src/nemo-view.c
	src/nemo-window-manage-views.c
	src/nemo-window.c
	test/test-nemo-directory-async.c
renamed: libnautilus-private/nautilus-profile.* -> libnemo-private/nemo-profile.*
Fixed building with tracker, leftover rename.
Merge commit '1d505a3ab7bc9d59713b90fc78e910842b7e7754' into nemo_master_merge
Revert: Various UI changes not related to Nemo

Merge commit '09962f5744890948e7a65edd3f70468e8959cb9c' into nemo_master_merge

Conflicts:
	src/nautilus-app-menu.ui
	src/nautilus-canvas-view-ui.xml
	src/nautilus-directory-view-ui.xml
	src/nautilus-list-view-ui.xml
	src/nemo-actions.h
	src/nemo-application.c
	src/nemo-shell-ui.xml
	src/nemo-toolbar.c
	src/nemo-view.c
	src/nemo-window-manage-views.c
	src/nemo-window-menus.c
	src/nemo-window-private.h
	src/nemo-window-slot.c
	src/nemo-window.c
Merge commit 'd4a2f6e0531283bf943052812ca09610a3dd072d' into nemo_master_merge

Conflicts:
	src/Makefile.am
	src/nautilus-desktop-canvas-view.xml
	src/nautilus-desktop-icon-view-ui.xml
	src/nemo-desktop-icon-view-ui.xml
	src/nemo.gresource.xml
Renamed: nautilus-desktop-canvas-view.xml -> nemo-desktop-canvas-view-ui.xml
Merge commit '4625c3b6392711712fca0b5d97942829b4c452e1' into nemo_master_merge

But dont removed error location display

Conflicts:
	po/POTFILES.in
	po/ar.po
	po/es.po
	po/gl.po
	po/he.po
	po/lt.po
	po/mr.po
	po/pa.po
	po/zh_HK.po
	po/zh_TW.po
	src/nautilus-desktop-canvas-view-ui.xml
	src/nautilus-desktop-canvas-view.xml
	src/nemo-desktop-canvas-view-ui.xml
	src/nemo-query-editor.c
	src/nemo-window-manage-views.c
Merge commit '85f08a3dd3b8d1a04f7f9e8d4bf7b2d40406eef4' into nemo_master_merge

Conflicts:
	src/nemo-application.c
	src/nemo-window.c
Merge commit '2f4c9a71d03ee420d244e5c7e1555a03858d0fdb' into nemo_master_merge

Conflicts:
	src/nemo-mime-actions.c
Revert: "Improve the Image properties page"

Allready improved in Nemo

Merge commit 'cfba4a7dc3be80df34d11019db655a7171ba2e2f' into nemo_master_merge

Conflicts:
	src/nemo-image-properties-page.c
Merge commit '029219ec993a2e6bc8983939d9e8325d8112d933' into nemo_master_merge

Conflicts:
	src/.gitignore
	src/Makefile.am
	src/nemo-view.c
	src/nemo-window-manage-views.c
Merge commit '2bc1d449556f6e7f4176656503c2f01e1db8506c' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-desktop-link-monitor.c
	libnemo-private/nemo-file-operations.c
	libnemo-private/nemo-file-utilities.c
	libnemo-private/nemo-mime-application-chooser.c
	nautilus-sendto-extension/nautilus-nste.c
	src/nemo-error-reporting.c
	src/nemo-mime-actions.c
	src/nemo-properties-window.c
	src/nemo-view.c
	src/nemo-window.c
Renamed: nautilus-special-location-bar.* -> src/nemo-special-location-bar.*
Merge commit '0d6ac8033036d2698baf1c617bd86a1ea73e34d4' into nemo_master_merge

Conflicts:
	data/nautilus-autorun-software.desktop.in.in
	po/POTFILES.in
	po/he.po
	po/zh_HK.po
	po/zh_TW.po
Revert: "Add bookmark for ~/Pictures instead of /usr/share/pixmaps"

Merge commit 'a0595ea96c093ff369ce2acaa86e3eefcb2f7ff0' into nemo_master_merge

Conflicts:
	src/nemo-properties-window.c