# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110204103001-\ # et23rm7l2vui7s0j # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: 6012fcf617293b02d8ff9673eabb3263e30f74df # timestamp: 2011-02-04 16:31:04 +0600 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # base_revision_id: dmitry.shulga@oracle.com-20110204051109-\ # 7enmofxh2vnpdmox # # Begin bundle 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