Merge in doc updates.
authorBrian Aker <brian@tangent.org>
Thu, 14 Apr 2011 01:29:28 +0000 (18:29 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 14 Apr 2011 01:29:28 +0000 (18:29 -0700)

Trivial merge