Merge in main doc trunk.
authorBrian Aker <brian@tangent.org>
Sat, 9 Apr 2011 00:46:58 +0000 (17:46 -0700)
committerBrian Aker <brian@tangent.org>
Sat, 9 Apr 2011 00:46:58 +0000 (17:46 -0700)

Trivial merge