# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101210094957-4g1k1b8cdfno1jrs # target_branch: file:///export/home/x/mysql-5.5-bugteam-bug58730/ # testament_sha1: 5319ebd76075d5e36c9265dac8e9ee86fb81925c # timestamp: 2010-12-10 10:50:01 +0100 # source_branch: file:///export/home/x/mysql-5.1-bugteam/ # base_revision_id: bjorn.munch@oracle.com-20101209202520-\ # 65ndrmt3t41a1e11 # # Begin bundle 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