# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ramil@mysql.com-20090510163506-k1tne6467bmhv941
# target_branch: file:///home/ram/mysql/mysql-6.0-bugteam/
# testament_sha1: 61156c92e59f51d836948f28978e3a5764022ea7
# timestamp: 2009-05-10 21:36:40 +0500
# source_branch: file:///home/ram/mysql/b40757-5.1-bugteam/
# base_revision_id: alexey.kopytov@sun.com-20090508180134-\
#   7wgpyofy2pdvcsf1
# 
# Begin bundle
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
/fBZ1F50L2epv/4u5IpwoSAGgmmm



