merge in ics-mr1-release history after reset to ics-mr1

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0510696..cad4cd8 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -157,7 +157,7 @@
     # give system access to wpa_supplicant.conf for backup and restore
     mkdir /data/misc/wifi 0770 wifi wifi
     chmod 0660 /data/misc/wifi/wpa_supplicant.conf
-    mkdir /data/local 0751 root root
+    mkdir /data/local 0771 shell shell
     mkdir /data/local/tmp 0771 shell shell
     mkdir /data/data 0771 system system
     mkdir /data/app-private 0771 system system