# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090903165409-\
#   kla0d44hdknl11en
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-45756/mysql-5.1-telco-6.2/
# testament_sha1: 4b73e1daa93ee374cbe2643006f657612e657dba
# timestamp: 2009-09-03 17:54:17 +0100
# base_revision_id: jonas@mysql.com-20090903074349-lmxhvp0c5ndzf43y
# 
# Begin bundle
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



