Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 27 Jun 2012 17:01:37 +0000 (19:01 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 27 Jun 2012 17:01:37 +0000 (19:01 +0200)

Trivial merge