Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 8 Oct 2011 01:25:59 +0000 (03:25 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 8 Oct 2011 01:25:59 +0000 (03:25 +0200)

Trivial merge