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

Documentation/user-manual.txt

1  2 
Documentation/user-manual.txt

Simple merge