Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 8 Oct 2012 19:32:06 +0000 (21:32 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 8 Oct 2012 19:32:06 +0000 (21:32 +0200)

Trivial merge