# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: li-bing.song@sun.com-20100130191429-9gfkniys2vax9dgd # target_branch: file:///home/anders/work/bzrroot/mysql-trunk-\ # bugfixing/ # testament_sha1: 9383b8d6a332cd178ea67dd9133eb11ccb851a95 # timestamp: 2010-01-31 03:15:39 +0800 # source_branch: file:///home/anders/work/bzrroot/mysql-5.1-rep-\ # semisync/ # base_revision_id: alik@sun.com-20091224073004-0dc03iv85ytii06b # # Begin bundle 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 IpwoSFTqjZqA