Merge with trunk and apply r6357's context nav changes to wiki blame as well
Authored by: thatch 2008-03-08
Parent: [r6672]
Child: [r6674]