Code

Merge branch 'feature'
authorFlorian Forster <octo@verplant.org>
Fri, 9 Jun 2006 21:26:19 +0000 (23:26 +0200)
committerFlorian Forster <octo@verplant.org>
Fri, 9 Jun 2006 21:26:19 +0000 (23:26 +0200)

Trivial merge