# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090715144755-p9uytrnfxn0r02kj
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/mysql-\
#   pe/
# testament_sha1: b4c2a11b11d04483d94f0f737194d5f555970644
# timestamp: 2009-07-15 22:49:42 +0800
# source_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/5.1-\
#   bugteam/
# base_revision_id: joro@sun.com-20090714092156-kec27sgwumv3nuzx
# 
# Begin bundle
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



