Merge remote branch 'origin/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 19 May 2010 14:49:40 +0000 (16:49 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 19 May 2010 14:49:40 +0000 (16:49 +0200)

Trivial merge