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

Trivial merge