# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277309228 -3600
# Node ID d7f1a76a253a047fd222bfb1917f4da6b7961201
# Parent  c163ef0b758d639fce74dfa11c7516e9cde64349# Parent  13da8b4dd996ba9bb97721b77fc2c12d08d283c3
Merge heads.

diff -r c163ef0b758d -r d7f1a76a253a mpviewplugins/mpcollectionviewplugin/resources/musiccollection.docml