Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jul 2012 18:09:57 +0000 (20:09 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jul 2012 18:09:57 +0000 (20:09 +0200)

Trivial merge