Merge branch 'ag/apache'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 1 May 2009 13:07:04 +0000 (15:07 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 1 May 2009 13:07:04 +0000 (15:07 +0200)

Trivial merge