Merge of warnings.
authorBrian Aker <brian@tangent.org>
Tue, 14 Feb 2012 16:31:54 +0000 (08:31 -0800)
committerBrian Aker <brian@tangent.org>
Tue, 14 Feb 2012 16:31:54 +0000 (08:31 -0800)

Trivial merge