Merge branch 'dm/t_option'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 17 Jan 2009 10:04:24 +0000 (11:04 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 17 Jan 2009 10:04:24 +0000 (11:04 +0100)

Trivial merge