# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090714013743-bpsa43q135gomsvz
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/5.1-\
#   bugteam/
# testament_sha1: 92f2c3bf6454ca1304e2ed63f0fb12446e40622a
# timestamp: 2009-07-14 09:38:06 +0800
# base_revision_id: alexey.kopytov@sun.com-20090712145643-\
#   t991j92a43izo8nr
# 
# Begin bundle
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
c0fIvnKV9qUShZZKxKUCl/4u5IpwoSFtur8G



