Merge branch 'bug-351909'
authorSebastian Pipping <sebastian@pipping.org>
Thu, 20 Jan 2011 14:19:38 +0000 (15:19 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 20 Jan 2011 14:19:38 +0000 (15:19 +0100)

Trivial merge