# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100511105308-grp2t3prh3tqivw0
# target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/
# testament_sha1: 8c6ed5cead92bd28ade31e3b1a979c64ffa50ef1
# timestamp: 2010-05-11 13:55:37 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@oracle.com-20100510132852-\
#   cz457uqvj8iiy9mm
# 
# Begin bundle
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
XifYnGhwpvpmeT9RdyRThQkGpYXgMA==


