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

Trivial merge