Merge, valgrind fix
authorBrian Aker <brian@tangent.org>
Sat, 27 Apr 2013 06:00:10 +0000 (23:00 -0700)
committerBrian Aker <brian@tangent.org>
Sat, 27 Apr 2013 06:00:10 +0000 (23:00 -0700)

Trivial merge