Merge pull request #1 from CyanogenMod-Atrix/ics

Merge