Merge from trunk
authorBrian Aker <brian@tangent.org>
Sat, 11 Feb 2012 23:24:54 +0000 (15:24 -0800)
committerBrian Aker <brian@tangent.org>
Sat, 11 Feb 2012 23:24:54 +0000 (15:24 -0800)

Trivial merge