# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110520190931-\ # imdp7k2jt9wi83or # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: 1288edb6e0fb687d28a3c6869f03d9e34ab0d7d1 # timestamp: 2011-05-21 02:11:56 +0700 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # base_revision_id: mayank.prasad@oracle.com-20110520092354-\ # 7sr3ixi04rnoqxwl # # Begin bundle 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