Merge doc update.
authorBrian Aker <brian@tangent.org>
Wed, 11 Jul 2012 22:47:04 +0000 (18:47 -0400)
committerBrian Aker <brian@tangent.org>
Wed, 11 Jul 2012 22:47:04 +0000 (18:47 -0400)

Trivial merge