# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20091203093111-2czeyv9hgjnmk7eo # target_branch: file:///home/daogangqu/mysql/bzrwork/bugtest/mysql-\ # 5.1-bugteam/ # testament_sha1: 9d711170efa5f460eb0c74b96a915309145b6bbd # timestamp: 2009-12-03 17:31:32 +0800 # base_revision_id: dao-gang.qu@sun.com-20091201082721-\ # 0mqlv9ffjfr72imi # # Begin bundle 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