# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.barkov@oracle.com-20110215113056-\ # 5qzxii3z08ibsvy7 # target_branch: file:///home/bar/mysql-bzr/mysql-trunk/ # testament_sha1: 88bd7557cc299dbd8751f1c3c6ec7db6d6c4971d # timestamp: 2011-02-15 14:33:36 +0300 # source_branch: file:///home/bar/mysql-bzr/mysql-5.5.b31384/ # base_revision_id: luis.soares@oracle.com-20110214163236-\ # pjqf0yrqmtl16a1l # # Begin bundle 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