Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 28 Apr 2012 00:19:17 +0000 (02:19 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 28 Apr 2012 00:19:17 +0000 (02:19 +0200)

Trivial merge