Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Sat, 26 May 2012 09:59:54 +0000 (11:59 +0200)
committerMichael <icarus@dabo.de>
Sat, 26 May 2012 09:59:54 +0000 (11:59 +0200)

Trivial merge