Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 9 Oct 2011 17:31:22 +0000 (19:31 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 9 Oct 2011 17:31:22 +0000 (19:31 +0200)

Trivial merge