Comment 2 for bug 1021931

Patch branchified at collab/dyrcona/lp1021931 in the working repository per Kathy's request.

I haven't tested it, yet, but will hopefully get to on Monday.

Thanks, Kathy!