Merge "cm: Update Android version in changelog" into cm-10.1
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index c45bf39..ab31d5c 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -51,12 +51,12 @@
General developers:
-------------------
* __UI Team:__ blunden, prash
-* __UX Team:__ blunden, ciwrl, daneshm, DvTonder, mad-murdock, maniac103
+* __UX Team:__ blunden, ciwrl, daneshm, DvTonder, mad-murdock, maniac103, Kaik541
* __Other:__ jruesga
Translators:
------------
-* __Afrikaans:__ Corrie Meyer
+* __Afrikaans:__ Corrie Meyer, David van Tonder
* __Catalan:__ Oriol Pellicer
* __Croatian:__ Antonio Marin
* __Czech:__ Ondrej Zima, Radovan Kepak, Pavel Kucera, Jozka Jozin, Jiri Silvarich, Vaclav Moucha
diff --git a/config/common.mk b/config/common.mk
index 5fccf65..24ecb2b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,5 +1,8 @@
PRODUCT_BRAND ?= cyanogenmod
+SUPERUSER_EMBEDDED := true
+SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
+
# To deal with CM9 specifications
# TODO: remove once all devices have been switched
ifneq ($(TARGET_BOOTANIMATION_NAME),)