web commit by http://madduck.myopenid.com/: merge bug with colon-in-links bug