Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
Merge remote-tracking branch 'quarx/cm-10.2' into cm-10.2-defy