Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 11 Nov 2011 22:36:53 +0000 (23:36 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 11 Nov 2011 22:36:53 +0000 (23:36 +0100)

Trivial merge