Patch by David Lawrence <dkl@redhat.com> = r/a=LpSolit git-svn-id: svn://10.0.0.236/trunk@254732 18797224-902f-48f8-a5cc-f745e15eee43