Merge branch 'bug-405495'
authorSebastian Pipping <sebastian@pipping.org>
Thu, 22 Mar 2012 03:08:30 +0000 (04:08 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 22 Mar 2012 03:08:30 +0000 (04:08 +0100)

Trivial merge