Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 15 Oct 2012 15:27:38 +0000 (17:27 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 15 Oct 2012 15:27:38 +0000 (17:27 +0200)

Trivial merge