Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 29 Feb 2012 00:10:32 +0000 (01:10 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 29 Feb 2012 00:10:32 +0000 (01:10 +0100)

Trivial merge