Merge branch 'bug-409277'
authorSebastian Pipping <sebastian@pipping.org>
Thu, 22 Mar 2012 15:17:12 +0000 (16:17 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 22 Mar 2012 15:17:12 +0000 (16:17 +0100)

Trivial merge