Merge changes I0d44e948,I1db7a972 into eclair

* changes:
  Fix 2260199 - App icons placed in folder widget are doubled after rebooting phone.
  Fix bug 2261637 - Workspace previews home screens on long pressing at the bottom of app drawer
tree: d9177ae8768b903a2e40554fe8da34f399ef6257
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE