tree 6b3c05c78530093e29f6dbb3b5f2f9078e44382a
parent b57832140ef7542a9e6f4f69f48efbfe80200c43
parent d555e2643f2bdc8b7e6096ce40943fcc56ec22d2
author Dirk Dougherty <ddougherty@google.com> 1287023522 -0700
committer Dirk Dougherty <ddougherty@google.com> 1287023522 -0700

Doc change: Merge commit 'd555e264' into manualmerge

Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30