Code

Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:48 +0000 (18:30 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:48 +0000 (18:30 +0100)

Trivial merge