Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 6 Aug 2012 10:34:38 +0000 (12:34 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 6 Aug 2012 10:34:38 +0000 (12:34 +0200)

Trivial merge