# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101129162758-idrffv9hwwhmo2xv # target_branch: file:///export/home/x/mysql-trunk-bugfixing-bug57035/ # testament_sha1: e94ac0cea22361920a41a59c624a2ecbb60e9a39 # timestamp: 2010-11-29 17:28:03 +0100 # source_branch: file:///export/home/x/mysql-5.5-bugteam/ # base_revision_id: georgi.kodinov@oracle.com-20101129154242-\ # fmu8ywi4pv0vpya2 # # Begin bundle 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 ZPBpyenYpbmrhS4Oqc7tyf+LuSKcKEhccv1WAA==