Merge branch 'dm/misc'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 8 Apr 2009 14:47:49 +0000 (16:47 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 8 Apr 2009 14:47:49 +0000 (16:47 +0200)

Trivial merge