# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090420144708-\
#   jv0fbopjn8t122qc
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-43789/mysql-6.0-rpl/
# testament_sha1: 9af0f10cb3d2e38e5bb52bf6b4129fc82dea5d4b
# timestamp: 2009-04-20 15:47:23 +0100
# base_revision_id: alfranio.correia@sun.com-20090417105911-\
#   ljlsiay90msxdzip
# 
# Begin bundle
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



