Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 29 Dec 2011 02:11:43 +0000 (03:11 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 29 Dec 2011 02:11:43 +0000 (03:11 +0100)

Trivial merge