Merge branch 'ff/ascent'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)

Trivial merge