Code

Merge branch 'origin'
authorFlorian Forster <octo@verplant.org>
Sun, 27 Jan 2008 15:20:26 +0000 (16:20 +0100)
committerFlorian Forster <octo@verplant.org>
Sun, 27 Jan 2008 15:20:26 +0000 (16:20 +0100)

Trivial merge