# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@oracle.com-20110524162755-14y7s0hxzhftpmlj
# target_branch: file:///home/anitha/mysql/repo/mysql-5.5-mod/
# testament_sha1: a7a4f748a18243ff84363f6e465818413411c625
# timestamp: 2011-05-24 22:02:04 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.1-mod/
# base_revision_id: marko.makela@oracle.com-20110524111121-\
#   bk4tp0a3z0w47evv
# 
# Begin bundle
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
pwoSGC0L26A=


