Merge branch 'release'
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 1 Nov 2011 22:46:03 +0000 (23:46 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 1 Nov 2011 22:46:03 +0000 (23:46 +0100)

Trivial merge