am 9e1556de: am 14e7d693: Merge "Some documentation fixes." into gingerbread

Merge commit '9e1556de8382c3eb68d324a7ef559b2cde1b3d6c'

* commit '9e1556de8382c3eb68d324a7ef559b2cde1b3d6c':
  Some documentation fixes.