# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110120133900-ygoyseep8798hy84 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 12438413627115d5b7796e75271f5dc44324ea40 # timestamp: 2011-01-20 15:39:08 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110111230102-\ # f1ssfwwh4rb6aadu # # Begin bundle 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 kXcQ