Merged ctxtnav and warning-api into trunk.
Authored by: jonas 2007-12-18
Parent: [r6356]
Child: [r6358]