Merge branch 'v0.10'
authorBert Belder <bertbelder@gmail.com>
Fri, 3 May 2013 09:33:47 +0000 (11:33 +0200)
committerBert Belder <bertbelder@gmail.com>
Fri, 3 May 2013 09:33:47 +0000 (11:33 +0200)

Trivial merge