# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1274180260 -3600
# Node ID 9b6761e5bd303b0049e29d06e7a5532801caab08
# Parent  b9e04db066d4b8ac36a0ce05affeb1a38a85878e# Parent  35eebde9876a931c3699243d178da5e2721ba886
Merge docml changeset with recent Nokia delivery.

diff -r b9e04db066d4 -r 9b6761e5bd30 videocollection/videocollectionview/data/videolistselectiondialog.docml
diff -r b9e04db066d4 -r 9b6761e5bd30 videoplayback/hbvideoplaybackview/resources/hbvideoplaybackview.docml