Merge remote branch 'origin/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 22 Dec 2009 15:59:48 +0000 (16:59 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 22 Dec 2009 15:59:48 +0000 (16:59 +0100)

Trivial merge