Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 27 Jun 2012 08:30:58 +0000 (10:30 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 27 Jun 2012 08:30:58 +0000 (10:30 +0200)

Trivial merge