am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit '58ffcb38828199b04a756e93a525779554efd9c9' into gingerbread-plus-aosp

* commit '58ffcb38828199b04a756e93a525779554efd9c9':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE