Merge trunk
authorBrian Aker <brian@tangent.org>
Fri, 17 Feb 2012 23:51:31 +0000 (15:51 -0800)
committerBrian Aker <brian@tangent.org>
Fri, 17 Feb 2012 23:51:31 +0000 (15:51 -0800)

Trivial merge