Merge commit 'origin/master'
authorsweinreuter <sascha.weinreuter@gmail.com>
Fri, 8 Apr 2011 14:28:52 +0000 (16:28 +0200)
committersweinreuter <sascha.weinreuter@gmail.com>
Fri, 8 Apr 2011 14:28:52 +0000 (16:28 +0200)

Trivial merge