Fixing bug 33661 with patch supplied by Miguel Martin (required a patch to /apache-lenya directory in kupu as well)
Changed paths: