Merge branch 'pull/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Aug 2007 08:56:17 +0000 (10:56 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Aug 2007 08:56:17 +0000 (10:56 +0200)

Trivial merge