Merge pull request #3871 from gfto/fix-compile-errors2
authorjmarshallnz <jcmarsha@gmail.com>
Sat, 4 Jan 2014 21:16:55 +0000 (13:16 -0800)
committerjmarshallnz <jcmarsha@gmail.com>
Sat, 4 Jan 2014 21:16:55 +0000 (13:16 -0800)
commit90f39147cc0aec5f22edc906ce99ac370736d3eb
treea8aced7b559171279efe0cb7af21ca0c38a404c3
parenta0c26039415205d0d5695ff7a7fc080d2f353e3d
parent632475b20822b010cf18255ce41530ac490cd118
Merge pull request #3871 from gfto/fix-compile-errors2

Fix two compilation errors.