Merge branch 'bug-425080'
authorSebastian Pipping <sebastian@pipping.org>
Mon, 9 Jul 2012 22:44:18 +0000 (00:44 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 9 Jul 2012 22:44:18 +0000 (00:44 +0200)

Trivial merge