# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: awardle@awardle-desktop-20100225181341-ahir2uwazg8chmzf
# target_branch: lp:ubuntu-doc
# testament_sha1: baecff6c0b562cd18a8e6a996485acd4f28da5f9
# timestamp: 2010-02-25 18:15:08 +0000
# source_branch: /home/awardle/ubuntu-doc/trunk
# base_revision_id: rocket2dmn@ubuntu.com-20100209033949-\
#   a9dryle9ttoswhp7
# 
# Begin patch
=== modified file 'windows/C/preparing.xml'
--- windows/C/preparing.xml	2009-12-13 18:54:59 +0000
+++ windows/C/preparing.xml	2010-02-25 18:13:41 +0000
@@ -252,7 +252,7 @@
 		
 		<sect2 id="preparing-email-msoe" status="review">
 			<title>Microsoft Outlook Express</title>
-			<para>These instructions are intended for users of <application>Microsoft Outlook Express 6</application>. If you are a user of a different version of <application>Outlook Express</application>, you may find instructions specific to that version from the Ubuntu <ulink url="https://help.ubuntu.com/community">Ubuntu community support website</ulink>.</para>
+			<para>These instructions are intended for users of <application>Microsoft Outlook Express 6</application>. If you are a user of a different version of <application>Outlook Express</application>, you may find instructions specific to that version from the <ulink url="https://help.ubuntu.com/community">Ubuntu community support website</ulink>.</para>
 			<sect3 id="preparing-email-msoe-address" status="review">
 				<title>Exporting the address book</title>
 				<orderedlist>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWclS0e8AAY7fgAAwWOf/93Im
1oC/7//wUAPtc6vT3hQ7vO890JJCmmmTEank0anojEwEyag0Bmp6gyUxGmaUbU9U9NCHqD1AAAAA
DJAEnpo0U2o2U2oGgAAAACSQlP0RmpiaNRpkyNGjQ0AAACSgp4pmk2qP1IBkGgDI0GRoAMxN4Zl7
5OhURDTuwANWzrHOfm5wo55WGb3+q/kIs7OnRafC7R4DzGYj+Nb9QTyX+3VKtWxEddBv2FuQMeoY
/OnRLBQp9dt393WRO4p2JwtdbEemYkMWMPgUOK0CtStq+NCsjV0UZH2oq+lru3GKmu3dNvtEUmZB
rzIWxPsQY1mTuYZaIp0VFXjnUmx2rKpLbGTPTCw8tKC/UbLJRUi10w8rGVhi61uC2BtAZnuE9Gen
YHhxyGCg5hhkwYyTF9pkpqQrllioMpyAnKMBYlcYZp6K6oBiaoyA0lwLRU0Kdep1xQH6fr0XmYGy
lUoGBkgsBlAfafaYduhepq6JEOyr34RhSy8W4acgOkwISI4rB0XmukVhEVW1ibrhKsugh1I5LWQ3
HDPegpsZCBiOi/FQgSBoK0KABJ5mXhRFi8QN1dHCJZEqihrBtKcpDBtlQvOd59uqc7Bo1VU3Gzaj
3qDFFHUAU0RAfBIySaZrV0OrtVF7fcWPdq25YjSw6HnfSgFzp2TH3dOHJm/ETjnCPHfRX0eXjW8L
i7iuJ3pllgF4XpNNB1h6lkh89xKkeB7UtQ3gH5SlPEbLNFywi37FwG4HDXd6aJqex9kbA0VbiKOZ
0tD74Twkzw5Cj0P6hyRj8vG9IRqRqdk7X0WMIHOkSt5nC8Mu2Ew4BdxEnACwywx4XK2lKAKl7dch
PBjpEt2/Y9Lx6l5z5Anq2T53x0P76tufwb20Y8e5q+bintizKhMlbTmvYYERVdJGlgLTGDgtlUMJ
cvhyyllleGkiagPXbqLWW3WnUPgsAtiPItCoi3/6IUQta5TrzwHpdVcDsXbh3TR5lPgTzI7zCeVY
S8u1uSKxEgMYZhdAO56jbchR8mtGBUIJRW6DQgpOCmCuKEp8Gomr95AO0Y0qURWYMjg+9Rn/DN5u
Ai94sGkVEUDwbBojMieZwZ6xw1qgPJkzJmUEnLPbPYjCq6B94E4jkYuIUJNgcDKocnsp7yxwo1p9
KhPqureyqV8am/OGxMVBWacLZiWnasMctaeZBMwMA1KIAWhFZogqyWG63G2JeBXJ1WUS9Myp5Q6z
pZupBbkeJSRMUlEXAXLeTEyhXRoFQEwtTDSiYLmRBzcZS9r33WnEwfbZMcFTS9VI5ksQTUwY0wRe
pULQ9J5VOzC8g8MlBp0ZdJDMlWWr+NopVqBwhviW8J0k+i9xqhOoxER2MvE0UP8XckU4UJDJUtHv