# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@oracle.com-20110524101614-p3967epj6hr6gowp
# target_branch: file:///home/anitha/mysql/repo/mysql-5.1-mod/
# testament_sha1: 257aacf705c6e5c549b3e04f60fa644cff75fb5c
# timestamp: 2011-05-24 22:00:30 +0530
# base_revision_id: vasil.dimov@oracle.com-20110522201102-\
#   d5bemprd5a5ruziu
# 
# Begin bundle
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


