Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 28 Apr 2012 00:03:41 +0000 (02:03 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 28 Apr 2012 00:03:41 +0000 (02:03 +0200)

Trivial merge