Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 6 Feb 2012 14:14:37 +0000 (15:14 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 6 Feb 2012 14:14:37 +0000 (15:14 +0100)

Trivial merge