Merge commit 'origin/lda17h/dodging_fixes'
authorRudolf Polzer <rpolzer@grawp.(none)>
Sun, 28 Mar 2010 18:53:01 +0000 (20:53 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Sun, 28 Mar 2010 18:53:01 +0000 (20:53 +0200)

Trivial merge