Merge pull request #4701 from cg110/CoverityFixes4
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Tue, 13 May 2014 14:18:32 +0000 (22:18 +0800)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Tue, 13 May 2014 14:18:32 +0000 (22:18 +0800)
Fixes for the obvious bug from this weeks coverity scan.


Trivial merge