Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 11 Oct 2012 14:55:12 +0000 (16:55 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 11 Oct 2012 14:55:12 +0000 (16:55 +0200)

Trivial merge