# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090719142240-\
#   7kvo3dhr9bra81sr
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-45292/mysql-5.1-bugteam/
# testament_sha1: f5b21098d89b9a7c47f1689415af2cf388c1b6e6
# timestamp: 2009-07-19 15:22:45 +0100
# base_revision_id: joro@sun.com-20090707144419-dcz527rmbjekaki8
# 
# Begin bundle
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



