Merge from cupcake
-rw-r--r-- 15602 5-14-2009-manifest.xml
-rw-r--r-- 10338 default.xml