# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20091111064507-2s4v0e94x5uz8ana # target_branch: file:///home/daogangqu/mysql/bzrwork/bug42851/mysql-\ # 5.1-bugteam/ # testament_sha1: 84e778735be5586e779c2f921f4dba84a204c22a # timestamp: 2009-11-11 14:45:47 +0800 # base_revision_id: davi.arnaut@sun.com-20091103181844-\ # 4zfm2j149rypot06 # # Begin bundle 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 7kkQHxlKYl8CJhhX1G6I/+LuSKcKEgWSIeOg