Merge with trunk.
authorBrian Aker <brian@tangent.org>
Wed, 12 Dec 2012 08:29:55 +0000 (03:29 -0500)
committerBrian Aker <brian@tangent.org>
Wed, 12 Dec 2012 08:29:55 +0000 (03:29 -0500)

Trivial merge