Merge of cppcheck, assert fix.
authorBrian Aker <brian@tangent.org>
Sun, 15 Jul 2012 07:52:17 +0000 (00:52 -0700)
committerBrian Aker <brian@tangent.org>
Sun, 15 Jul 2012 07:52:17 +0000 (00:52 -0700)

Trivial merge