# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110221143813-xeef3tufr6adrwi7 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 06544ae394d5df138123c7ace44d4281239520c6 # timestamp: 2011-02-21 16:38:25 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110219162633-\ # graaj89ad7v88dlh # # Begin bundle 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 J2B3eEEj/F3JFOFCQWe7VAg=