Code

Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 12 Oct 2007 20:33:11 +0000 (22:33 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 12 Oct 2007 20:33:11 +0000 (22:33 +0200)

Trivial merge