# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100519093721-tjpgfv9in6fkhtst
# target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/
# testament_sha1: be4ebfc680f98deb118906d943644119c0810587
# timestamp: 2010-05-19 12:38:34 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: inaam.rana@oracle.com-20100518165302-\
#   ovf5fqn6a0u212rc
# 
# Begin bundle
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
pmsCAA==


