Merge branch 'cyanogenmod' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into HEAD
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1