Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jan 2012 12:07:55 +0000 (13:07 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jan 2012 12:07:55 +0000 (13:07 +0100)

Trivial merge