# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277310179 -3600
# Node ID d3d3bd65fc7b0e310c1b94a96a2d497ea48352b9
# Parent  c48470be1ba700561c7070c880e3ebdabf11eeba# Parent  9b6761e5bd303b0049e29d06e7a5532801caab08
Merge heads.

diff -r c48470be1ba7 -r d3d3bd65fc7b videocollection/videocollectionview/data/videolistselectiondialog.docml
diff -r c48470be1ba7 -r d3d3bd65fc7b videoplayback/hbvideoplaybackview/resources/hbvideoplaybackview.docml