fixed test for python 2.5
fixed test for different urlparse behaviour
fixed test for different urlparse behaviour
fixed test for python 2.5
Merge branch '1.5.x'