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

Trivial merge