Now it won't choke on this anymore.  Patch also includes a Perl 5.6
compatibility update (see bug 52921 and bug 44622 for details).