Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 26 May 2012 09:26:18 +0000 (11:26 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 26 May 2012 09:26:18 +0000 (11:26 +0200)

Trivial merge