Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 31 Oct 2012 14:58:41 +0000 (15:58 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 31 Oct 2012 14:58:41 +0000 (15:58 +0100)

Trivial merge