markup branch: Renamed the `trac.util.markup` module to `trac.util.html`, which basically just imports the corresponding stuff from the `markup` package, as [http://lists.edgewall.com/archive/trac-dev/2006-July/000749.html explained] on trac-dev. Not actually using Markup for templating yet.