Merge pull request #165 from CyanogenMod/cm-10.1

update
Merge remote-tracking branch 'koush/master' into cm-10.2