# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277309925 -3600
# Node ID 2b8fc9e8d1673278eeb048bb7458832a372c0866
# Parent  6481344a6d676a0418689da45a490d63589403d6# Parent  e7ef9a1d6228d480d6db0ecf3d7b4c7efd304793
Merge heads.

diff -r 6481344a6d67 -r 2b8fc9e8d167 data/fullscreen.docml
diff -r 6481344a6d67 -r 2b8fc9e8d167 data/slideshow.docml