Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 12 Nov 2011 12:39:02 +0000 (13:39 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 12 Nov 2011 12:39:02 +0000 (13:39 +0100)

Trivial merge