# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277309052 -3600
# Node ID 53593dc70ae234a6b4025cc618254ef4f837d7da
# Parent  99b096216bc8685ead0facdfc850d7ffd1a29c22# Parent  d67f854a44b4953a515baa53ebf09d5daa4e7e39
Merge heads.

diff -r 99b096216bc8 -r 53593dc70ae2 userguide/resources/xml/categoryView.docml
diff -r 99b096216bc8 -r 53593dc70ae2 userguide/resources/xml/contentsView.docml