Merge for version. 1.0.4
authorBrian Aker <brian@tangent.org>
Fri, 27 Jan 2012 06:37:38 +0000 (22:37 -0800)
committerBrian Aker <brian@tangent.org>
Fri, 27 Jan 2012 06:37:38 +0000 (22:37 -0800)

Trivial merge