Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 16 Apr 2012 16:45:01 +0000 (18:45 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 16 Apr 2012 16:45:01 +0000 (18:45 +0200)

Trivial merge