# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: hezx@greatopensource.com-20110126075510-\ # f23ditvfxcvu3xx9 # target_branch: file:///media/sdb2/hezx/work/mysql/bzr/b12133/trunk/ # testament_sha1: 785853fc454001be07ed07792af009afc3af91a3 # timestamp: 2011-01-26 15:55:15 +0800 # base_revision_id: mattias.jonsson@oracle.com-20110110163747-\ # ssccpoh0wesjl68q # # Begin bundle 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 dyRThQkJM18YcA==