# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110527115052-\ # f7p1tv8qyrgo11m8 # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: 61c9e6a352c91db149262d8607845c339ce81c57 # timestamp: 2011-05-27 18:52:09 +0700 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # base_revision_id: tor.didriksen@oracle.com-20110526152009-\ # mdn9u03pruj0mf2z # # Begin bundle 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 8g==