Merge branch 'master' into httpd
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 7 Sep 2010 17:33:02 +0000 (17:33 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 7 Sep 2010 17:33:02 +0000 (17:33 +0000)

Trivial merge