Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 11 Jun 2012 13:30:12 +0000 (15:30 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 11 Jun 2012 13:30:12 +0000 (15:30 +0200)

Trivial merge