# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sunanda.menon@oracle.com-20110322133404-\
#   662pqgdd8ctrk54b
# target_branch: file:///net/helheim/store/bteam/bzr/mysql-5.5.11-\
#   release/
# testament_sha1: ab55df9257dad3d2e874a751b2a359c0350c06fb
# timestamp: 2011-03-22 14:34:26 +0100
# source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\
#   5.5.10-release/
# base_revision_id: georgi.kodinov@oracle.com-20110318150013-\
#   u8u9kaz20zyum2eb
# 
# Begin bundle
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
3F3JFOFCQ5xDSYA=


