# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090716065331-bzg4g8ap1769s7qf
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/mysql-\
#   pe/
# testament_sha1: e5b9bc78e67a3d37a7c940c583cb5c59ba2f1212
# timestamp: 2009-07-16 14:55:22 +0800
# source_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/5.1-\
#   bugteam/
# base_revision_id: davi.arnaut@sun.com-20090715183127-\
#   sdsodoe5w8jvtijt
# 
# Begin bundle
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



