Commit 8255b497b625735acab527f15617daa19f796165

Edward Thomson 2013-08-19T17:49:12

Quiet down some warnings