Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 17 Jan 2013 22:31:16 +0000 (23:31 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 17 Jan 2013 22:31:16 +0000 (23:31 +0100)

Trivial merge