Merge branch 'pull/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 Sep 2007 19:00:40 +0000 (21:00 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 Sep 2007 19:00:40 +0000 (21:00 +0200)

Trivial merge