Merge branch 'release'
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 11 Nov 2011 19:55:46 +0000 (20:55 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 11 Nov 2011 19:55:46 +0000 (20:55 +0100)

Trivial merge