am 75fd1ec4: DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can\'t be merged back.

Merge commit '75fd1ec46da7708bd46183da7999ec891d63140d' into eclair-plus-aosp

* commit '75fd1ec46da7708bd46183da7999ec891d63140d':
  DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can't be merged back.