Merge remote-tracking branch 'origin/DragonFly_RELEASE_2_10' into soundfix
authorMatthias Rampke <matthias@rampke.de>
Sat, 7 May 2011 15:41:45 +0000 (17:41 +0200)
committerMatthias Rampke <matthias@rampke.de>
Sat, 7 May 2011 15:41:45 +0000 (17:41 +0200)

Trivial merge