# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110520191112-\ # toicuupjg1fgi3pj # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: f0d96fdcbc61a514508c903a6ad283cc93c147c7 # timestamp: 2011-05-21 02:11:37 +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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