am 609fef71: am 3a0576a4: merge from open-source froyo

Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp

* commit '609fef7173a1278cb79d7aefdd22a22547648cab':