Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 11 Jun 2012 13:49:29 +0000 (15:49 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 11 Jun 2012 13:49:29 +0000 (15:49 +0200)

Trivial merge