# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090606134302-\
#   7lqq727mntrcq4qo
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-43929/mysql-5.1-bugteam/
# testament_sha1: 92b0199a4a2fb0b14d78c38ffcb4dafa97ff8d55
# timestamp: 2009-06-06 14:44:42 +0100
# base_revision_id: bjorn.munch@sun.com-20090525205831-\
#   zitq9aysxy5zgf5r
# 
# Begin bundle
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
yRThQkDSALO4



