# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1274181208 -3600
# Node ID d67f854a44b4953a515baa53ebf09d5daa4e7e39
# Parent  3752719124563d43b538d7e0e2596ab71c130683# Parent  224347f45dc01692f86d587cf5862c35861eead6
Merge docml changeset with recent Nokia delivery.

diff -r 375271912456 -r d67f854a44b4 userguide/resources/xml/categoryView.docml
diff -r 375271912456 -r d67f854a44b4 userguide/resources/xml/contentsView.docml