Merge branch 'pull/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 25 May 2007 17:51:59 +0000 (19:51 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 25 May 2007 17:51:59 +0000 (19:51 +0200)

Trivial merge