Merge branch 'pull/master'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Thu, 23 Aug 2007 06:05:56 +0000 (08:05 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Thu, 23 Aug 2007 06:05:56 +0000 (08:05 +0200)

Trivial merge