# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110610035239-\ # tef314b27j7hkhm6 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\ # bug11753738/ # testament_sha1: 6d6eaa3a211fd151eeb949ec9a40c76d7373f61b # timestamp: 2011-06-10 10:52:47 +0700 # base_revision_id: marko.makela@oracle.com-20110609185041-\ # f5ur24c5mj7rg1cu # # Begin bundle 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 G6r82Q==