Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jul 2012 18:02:53 +0000 (20:02 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jul 2012 18:02:53 +0000 (20:02 +0200)

Trivial merge