Merge branch 'master' into ff/rrdd
authorFlorian Forster <octo@leeloo.home.verplant.org>
Tue, 1 Jul 2008 10:01:46 +0000 (12:01 +0200)
committerFlorian Forster <octo@leeloo.home.verplant.org>
Tue, 1 Jul 2008 10:01:46 +0000 (12:01 +0200)

Trivial merge