# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812753 -3600
# Node ID eff9df3d9c988901791da4a4a258301c1060385c
# Parent  b95ddb5a0d10fd8733fce113c2f32211f897a110# Parent  79c49924ae231a42e6dff4c2054bb7e009dbb2cb
Catchup to latest Symbian^4

diff -r 79c49924ae23 -r eff9df3d9c98 mpengine/src/mpsongscanner.cpp
diff -r 79c49924ae23 -r eff9df3d9c98 mpviewplugins/mpcollectionviewplugin/resources/musiccollection.docml