Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 12 Jan 2012 22:48:20 +0000 (23:48 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 12 Jan 2012 22:48:20 +0000 (23:48 +0100)

Trivial merge