Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 21 Jan 2011 00:34:46 +0000 (01:34 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 21 Jan 2011 00:34:46 +0000 (01:34 +0100)

Trivial merge