Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 11:01:15 +0000 (13:01 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 11:01:15 +0000 (13:01 +0200)

Trivial merge