# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20101221105504-tzcr2etjfazkmip3 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk-\ # bugfixing/ # testament_sha1: 148f17bd365ebfbc1583c1eec35fbf65b6452757 # timestamp: 2010-12-21 12:55:48 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: dao-gang.qu@sun.com-20101221103920-\ # grvnu759ri06q30h # # Begin bundle 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