# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090523080726-\
#   7h6wz3yh2r22nlo7
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-43929/mysql-5.1-bugteam/
# testament_sha1: 6e88cc904d52f2fa5027da52a7ac5bf489bcef39
# timestamp: 2009-05-23 09:07:34 +0100
# base_revision_id: matthias.leich@sun.com-20090520195829-\
#   2q0xhtjqt4gc8htf
# 
# Begin bundle
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



