Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 3 Dec 2012 07:30:25 +0000 (08:30 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 3 Dec 2012 07:30:25 +0000 (08:30 +0100)

Trivial merge