Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 8 Jun 2012 05:51:03 +0000 (07:51 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 8 Jun 2012 05:51:03 +0000 (07:51 +0200)

Trivial merge