Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 11 Jan 2011 12:29:16 +0000 (13:29 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 11 Jan 2011 12:29:16 +0000 (13:29 +0100)

Trivial merge