# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110519093628-zldw938goh2lr2in # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 3dbb1eef462464a1ccbecc586b35f815f2c8a434 # timestamp: 2011-05-19 12:36:38 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110516194358-\ # bebbn66gdh75adif # # Begin bundle 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 GwqAv/F3JFOFCQUtJMbg