Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 11 Sep 2012 12:44:22 +0000 (14:44 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 11 Sep 2012 12:44:22 +0000 (14:44 +0200)

Trivial merge