Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 3 Mar 2012 14:33:18 +0000 (15:33 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 3 Mar 2012 14:33:18 +0000 (15:33 +0100)

Trivial merge