Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 30 Dec 2012 20:32:41 +0000 (21:32 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 30 Dec 2012 20:32:41 +0000 (21:32 +0100)

Trivial merge