Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 9 Dec 2011 12:48:22 +0000 (13:48 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 9 Dec 2011 12:48:22 +0000 (13:48 +0100)

Trivial merge