am 938cb839: am 999b6a5e: reconcile main tree with open-source eclair

Merge commit '938cb839512159fb622f919271d121dfe50332b0'

* commit '938cb839512159fb622f919271d121dfe50332b0':
  android-2.1_r1 snapshot
  Keep banging on the launcher locks up bug.  This moves the
  Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
  Fix bug 2258128 - homescreen on Passion unresponsive while still not leaking the contexts.