am 24903fec: am fc5aa9cf: Merge "doc change: miscellaneous small fixes." into froyo

Merge commit '24903fecb0607b7972d4576e9efd258a7e9590f4' into kraken

* commit '24903fecb0607b7972d4576e9efd258a7e9590f4':
  doc change: miscellaneous small fixes.