merge r7707 from trunk
add unit test of escaping image urls
Contributed by Holger Just.
Authored by: tmaruyama 2011-11-02
Parent: [r7708]
Child: [r7710]