Merge branch 'topic/doc_cleanup_20120908'
Karen Etheridge [Sat, 8 Sep 2012 19:30:05 +0000 (12:30 -0700)]

Trivial merge