Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 18 May 2013 18:52:24 +0000 (20:52 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 18 May 2013 18:52:24 +0000 (20:52 +0200)

Trivial merge