Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 8 Oct 2012 23:06:56 +0000 (01:06 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 8 Oct 2012 23:06:56 +0000 (01:06 +0200)

Trivial merge