fix compilation errors
Merge branch 'master' of github.com:dbeck/virtdb-common