# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090929144052-\
#   iwcyi3ack8zwakw9
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/backport/mysql-5.1-rep%2B2/
# testament_sha1: 11d2d28c439675a56f5be46bfb0f2d6d8277ba5f
# timestamp: 2009-09-29 15:40:59 +0100
# base_revision_id: alfranio.correia@sun.com-20090929142712-\
#   bk2vulvk4gvlvdfr
# 
# Begin bundle
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
/aJ00Hgb8z/xdyRThQkKLCuY0A==



