Merged Mercurial browsing fix from trunk (r1228 and r1229).
Authored by: jplang 2008-03-12
Parent: [r1229]
Child: [r1231]