# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.glukhov@sun.com-20090619082443-1u6dm75s5gciyjso
# target_branch: file:///home/gluh/MySQL/mysql-5.1-bugteam/
# testament_sha1: f4cdb3a81424a4b41a125ae47e537b4e4d8df8e2
# timestamp: 2009-06-19 13:24:53 +0500
# source_branch: bzr+ssh://sgluhov@bk-internal.mysql.com/bzrroot\
#   /server/mysql-5.1-bugteam/
# base_revision_id: davi.arnaut@sun.com-20090618232147-\
#   i5ytql9whvtnao1z
# 
# Begin bundle
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


