Merge branch 'release-5.17.10' into blead
authorMax Maischein <corion@cpan.org>
Fri, 22 Mar 2013 07:53:18 +0000 (08:53 +0100)
committerMax Maischein <corion@cpan.org>
Fri, 22 Mar 2013 07:53:18 +0000 (08:53 +0100)

Trivial merge