Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 2 Oct 2011 10:11:18 +0000 (12:11 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 2 Oct 2011 10:11:18 +0000 (12:11 +0200)

Trivial merge