Merge in work to test return types.
authorBrian Aker <brian@tangent.org>
Wed, 30 Nov 2011 16:43:24 +0000 (08:43 -0800)
committerBrian Aker <brian@tangent.org>
Wed, 30 Nov 2011 16:43:24 +0000 (08:43 -0800)

Trivial merge