Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 12 Jan 2011 10:44:20 +0000 (11:44 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 12 Jan 2011 10:44:20 +0000 (11:44 +0100)

Trivial merge