# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090928060150-a7vxnost0bbywv11 # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: 7d4310943fcd3d7cf129cb544174002ddc9d6dec # timestamp: 2009-09-28 14:02:09 +0800 # base_revision_id: dao-gang.qu@sun.com-20090831022601-\ # h2ikk473x5njqq29 # # Begin bundle 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 mdOpqvDLPd/riSI//i7kinChIezIAHA=