Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 25 Jan 2012 22:59:13 +0000 (23:59 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 25 Jan 2012 22:59:13 +0000 (23:59 +0100)

Trivial merge