Merge trunk.
authorBrian Aker <brian@tangent.org>
Sat, 9 Mar 2013 22:22:11 +0000 (17:22 -0500)
committerBrian Aker <brian@tangent.org>
Sat, 9 Mar 2013 22:22:11 +0000 (17:22 -0500)

Trivial merge