Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 2 Jun 2007 07:25:42 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 2 Jun 2007 07:25:42 +0000 (09:25 +0200)

Trivial merge