am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

Merge commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52'

* commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52':
  COMMENT ONLY change to fix some formatting glitches and