Merge commit 'refs/changes/27/2727/1' of ssh://gerrit.slimroms.net:29418/SlimRoms/packages_apps_Settings into HEAD

Conflicts:
	src/com/android/settings/DreamSettings.java