Merge branch 'release-5.15.8' into blead
authorMax Maischein <corion@cpan.org>
Mon, 20 Feb 2012 23:01:14 +0000 (00:01 +0100)
committerMax Maischein <corion@cpan.org>
Mon, 20 Feb 2012 23:01:14 +0000 (00:01 +0100)

Trivial merge