Code

Merge remote branch 'powdahound/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 09:02:57 +0000 (11:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 09:02:57 +0000 (11:02 +0200)

Trivial merge