Merge in changes from the 1.1 branch.
[mmh] / VERSION
1 1.1