Merge branch 'cm-donut-4.1' of...

Merge branch 'cm-donut-4.1' of git@github.com:cyanogen/android_packages_apps_Settings into cm-donut-4.1

Conflicts:
	src/com/android/settings/widget/SettingsAppWidgetProvider.java