# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110516184622-7vr7do47i8tmg97g # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # testament_sha1: 9c5d8ec2f0bf4c1bc3ac06f974e65f3b6b813c8d # timestamp: 2011-05-16 21:46:34 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-5.5/ # base_revision_id: andrei.elkin@oracle.com-20110516184244-\ # 0khjknei5n8izfia # # Begin bundle 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