# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: hezx@greatopensource.com-20110117100013-\ # h33ksz5wowjihijn # target_branch: file:///media/sdb2/hezx/work/mysql/bzr/b57953/trunk/ # testament_sha1: 079b224e8a40c1cd1cf94c63e4ef9d33ac704633 # timestamp: 2011-01-17 18:01:27 +0800 # source_branch: file:///media/sdb2/hezx/work/mysql/bzr/b57953/5.5/ # base_revision_id: hezx@greatopensource.com-20110117095259-\ # jbpwy1vhb0ggkq9k # # Begin bundle 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 XckU4UJDTKi3wA==