superuser

Change-Id: Idef89369f650116c20bd69e76bb0e6394ed99e8c
Upstream is authoritative for Koush's package layout
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android into cm-10.1_mako

Conflicts:
	default.xml