# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090906145301-9a0lc5jnx169hycu # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: d362e51e3d22e9716b36a4a0aa327d4165979950 # timestamp: 2009-09-06 22:54:30 +0800 # base_revision_id: dao-gang.qu@sun.com-20090831022601-\ # h2ikk473x5njqq29 # # Begin bundle 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 Qn+LuSKcKEg342lPAA==