Merge branch 'bug-411197'
authorSebastian Pipping <sebastian@pipping.org>
Sun, 8 Apr 2012 18:32:42 +0000 (20:32 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 8 Apr 2012 18:32:42 +0000 (20:32 +0200)

Trivial merge