# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@oracle.com-20101001132513-\ # 8zlhvzspk2hd5edy # target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/ # testament_sha1: c185685039e5d620c93f391f2ea76b6c4dfad3df # timestamp: 2010-10-01 15:26:07 +0200 # source_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/ # base_revision_id: mattias.jonsson@oracle.com-20101001121600-\ # hbm9uphik900sw2x # # Begin bundle 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