Update tests from trunk
authorBrian Aker <brian@tangent.org>
Sat, 18 Feb 2012 03:13:35 +0000 (19:13 -0800)
committerBrian Aker <brian@tangent.org>
Sat, 18 Feb 2012 03:13:35 +0000 (19:13 -0800)

Trivial merge