Merge from gingerbread

Change-Id: Ie752f05a3b52c4c431230a8e4a9522b701852aba

diff --cc generate-blob-scripts.sh
index 5f1fd44,320e112..8079c67
--- 1/generate-blob-scripts.sh
--- 2/generate-blob-scripts.sh
+++ b/generate-blob-scripts.sh
@@@ -43,7 -43,7 +43,7 @@@ the
  fi
  shift
  
- DEVICES="passion crespo stingray"
 -DEVICES="passion crespo crespo4g"
++DEVICES="passion crespo crespo4g stingray"
  
  ARCHIVEDIR=archive-$(date +%s)
  mkdir $ARCHIVEDIR