Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 11:36:25 +0000 (13:36 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 11:36:25 +0000 (13:36 +0200)

Trivial merge