Merge in changes from the 1.1 branch.
[mmh] / DATE
1 1 Jul 2003