commit in batch
Merge branch 'vm' of github.com:kariya/postgres into vm