Merge trunk
authorBrian Aker <brian@tangent.org>
Sat, 18 Feb 2012 21:36:50 +0000 (13:36 -0800)
committerBrian Aker <brian@tangent.org>
Sat, 18 Feb 2012 21:36:50 +0000 (13:36 -0800)

Trivial merge