# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100514134101-i5vq1c9yqlzfw97b
# target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# testament_sha1: 26a305041b835a46c684200a5cb65089802f3034
# timestamp: 2010-05-14 16:41:11 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20100514131050-\
#   mkhlvlui1u52irob
# 
# Begin bundle
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


