Merge branch 'bug-410073'
authorSebastian Pipping <sebastian@pipping.org>
Fri, 30 Mar 2012 17:29:14 +0000 (19:29 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Fri, 30 Mar 2012 17:29:14 +0000 (19:29 +0200)

Trivial merge