Merge branch 'release-5.17.11' into blead
authorRicardo Signes <rjbs@cpan.org>
Sun, 21 Apr 2013 00:57:26 +0000 (20:57 -0400)
committerRicardo Signes <rjbs@cpan.org>
Sun, 21 Apr 2013 00:57:26 +0000 (20:57 -0400)

Trivial merge