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

Trivial merge