Merge branch 'ag/apache'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Apr 2009 10:45:28 +0000 (12:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Apr 2009 10:45:28 +0000 (12:45 +0200)

Trivial merge