# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090715150651-ponb20f3ucwqymnm
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/mysql-\
#   pe/
# testament_sha1: 3f6f394b860699edda5ef5c1087baa53d434ce62
# timestamp: 2009-07-15 23:08:38 +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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



