Merge remote branch 'trenkel/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 18:58:59 +0000 (19:58 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 18:58:59 +0000 (19:58 +0100)

Trivial merge