# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@oracle.com-20101014101200-\ # aaz2pstq1af5gn8l # target_branch: file:///home/alik/MySQL/bzr/mysql-trunk-merge/ # testament_sha1: c1f6b39256c60778bb542c7989a4588888ef54cb # timestamp: 2010-10-14 14:12:31 +0400 # source_branch: file:///mnt/raid/alik/MySQL/bzr/mysql-trunk/ # base_revision_id: alexander.nozdrin@oracle.com-20101013172614-\ # ai7dka3mqvqbvwxi # # Begin bundle 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 BkRA