Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 5 Oct 2011 22:20:34 +0000 (00:20 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 5 Oct 2011 22:20:34 +0000 (00:20 +0200)

Trivial merge