# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: heymrdjd@gmail.com-20100922125104-rlcw78ze93ioovry
# target_branch: bzr+ssh://bazaar.launchpad.net/~heymrdjd/xubuntu-\
#   docs/maverick/
# testament_sha1: 7297d879e4636fece65bf1c04063008f98fc202e
# timestamp: 2010-09-22 13:10:22 -0500
# base_revision_id: heymrdjd@gmail.com-20100921071815-frffcm40wwldcwap
# 
# Begin patch
=== modified file 'desktop-guide/musicvideophotos/C/video.xml'
--- desktop-guide/musicvideophotos/C/video.xml	2010-09-21 07:18:15 +0000
+++ desktop-guide/musicvideophotos/C/video.xml	2010-09-22 12:51:04 +0000
@@ -35,7 +35,7 @@
             <para>
             Install the 
             <ulink url='apt:libdvdnav4'>libdvdnav4</ulink>, 
-            <ulink url='apt:libdvdread3'>libdvdread3</ulink> and 
+            <ulink url='apt:libdvdread4'>libdvdread4</ulink> and 
             <ulink url='apt:gstreamer0.10-plugins-ugly'>
             gstreamer0.10-plugins-ugly</ulink> packages.
             </para>
@@ -45,7 +45,7 @@
             If you would like to play encrypted DVDs, press &terminal; and type 
             the following into the screen which appears, followed by the 
             <keycap>Enter</keycap> key: 
-            <screen>sudo /usr/share/doc/libdvdread3/install-css.sh</screen>
+            <screen>sudo /usr/share/doc/libdvdread4/install-css.sh</screen>
             </para>
             </step>
             <step>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdjgvvgAABJfgAAQQGFxUBIA
AACv794QIABkRTaajamQyGjTaRiFGgBMBBkwQhDmaVnH5r9hMFQyJ7EUzThiw4Ixc/mQVpexbPS2
9yLLTxaFbWvXcN2zcydOQxpD652acQC4g4Z96jI5BipgKAAiM5Zz45Kd/4u5IpwoSGxwX3wA