Merge "APN: change order of 44010." into froyo
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 0bc460e..1f39fa2 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -15,8 +15,7 @@
 * Droid: Koush
 * Dream/Sapphire: Cyanogen
 * Hero: Lox (GSM), Darchstar (CDMA)
-* Desire: Kali-, Defer
-* DesireC: Kali-, Defer
+* Desire (GSM/CDMA): Kali-, Defer
 * Incredible: Koush
 * Espresso (Slide): Wes Garner, Chris Soyars, Cyanogen
 * Supersonic (EVO): Cyanogen, toastcfh
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 93789de..547c4f0 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -18,6 +18,12 @@
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/inc
 
+# Include the FM Radio
+PRODUCT_PACKAGES += FM
+# Include the Flashlight/Torch
+PRODUCT_PACKAGES += Torch
+
+
 #
 # Set ro.modversion
 #