Merge branch 'maint'
commit5071877d2c623ffc41b48bbb49908a61051a6228
authorJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 26 Aug 2007 14:36:38 +0000 (26 10:36 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 26 Aug 2007 14:36:38 +0000 (26 10:36 -0400)
tree1d7028d6aad3d10075ca7aff7678bd2aeaa0a4c2
parent6e30fb0c3241ecdf1ac47c1495bc3b58a0dc6f05
parenta115daff12d8d26975ff15a4278a212df2c8c70b
Merge branch 'maint'

Conflicts:

Documentation/user-manual.txt
Documentation/user-manual.txt