# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: zhenxing.he@sun.com-20091013042148-o6su1c77gqb9ajyl # target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/r47323/pe/ # testament_sha1: 875735721d874e5219010b3805d5f6956c317a35 # timestamp: 2009-10-13 12:23:13 +0800 # source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/r47323\ # /5.1-bugteam/ # base_revision_id: li-bing.song@sun.com-20091013023619-\ # 995nbzheabeba9je # # Begin bundle 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