Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 29 Sep 2011 23:35:42 +0000 (01:35 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 29 Sep 2011 23:35:42 +0000 (01:35 +0200)

Trivial merge