Merge up clang fixes.
authorBrian Aker <brian@tangent.org>
Fri, 6 Jan 2012 03:51:43 +0000 (19:51 -0800)
committerBrian Aker <brian@tangent.org>
Fri, 6 Jan 2012 03:51:43 +0000 (19:51 -0800)

Trivial merge