Fix two clang3.3 warnings
Merge pull request #2235 from gavinandresen/clangwarnings

Fix two clang3.3 warnings