# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100909162420-jhz48s47fbzugpdz # target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # merge/ # testament_sha1: 2cff178d12da861b4fb88cfa1218899c2e67dfd4 # timestamp: 2010-09-09 10:24:43 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: davi.arnaut@oracle.com-20100909131057-\ # ph6hh35tztndczgb # # Begin bundle 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 hKSA