# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090930231936-gag0u906gphcppo2 # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: b52b6fdd92df2b32cf29d7a92e607d071794daee # timestamp: 2009-10-01 07:20:55 +0800 # base_revision_id: davi.arnaut@sun.com-20090930230608-\ # jajp0ho75184xpkg # # Begin bundle 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