Merge in 1.0.3 1.0.3
authorBrian Aker <brian@tangent.org>
Mon, 9 Jan 2012 06:28:56 +0000 (22:28 -0800)
committerBrian Aker <brian@tangent.org>
Mon, 9 Jan 2012 06:28:56 +0000 (22:28 -0800)

Trivial merge