Merge in build trunk
authorBrian Aker <brian@tangent.org>
Mon, 30 Jan 2012 17:03:45 +0000 (09:03 -0800)
committerBrian Aker <brian@tangent.org>
Mon, 30 Jan 2012 17:03:45 +0000 (09:03 -0800)

Trivial merge