Merge up current work from trunk
authorBrian Aker <brian@tangent.org>
Tue, 29 Nov 2011 23:28:01 +0000 (15:28 -0800)
committerBrian Aker <brian@tangent.org>
Tue, 29 Nov 2011 23:28:01 +0000 (15:28 -0800)

Trivial merge