# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090927070558-ji88cn7xiqem1qn1 # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: 2e840ad68a5b5396817a0a382c9a8ab01d6df286 # timestamp: 2009-09-27 15:06:17 +0800 # base_revision_id: dao-gang.qu@sun.com-20090831022601-\ # h2ikk473x5njqq29 # # Begin bundle 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