Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 3 Jan 2012 23:59:54 +0000 (00:59 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 3 Jan 2012 23:59:54 +0000 (00:59 +0100)

Trivial merge