# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@oracle.com-20100830153355-\ # 9r3def4u5ht5xw5k # target_branch: file:///Users/mattiasj/mysql-bzr/b50036-55-bf/ # testament_sha1: 1051390839e8580535cad9735fb04a451b965789 # timestamp: 2010-08-30 17:34:10 +0200 # base_revision_id: bar@mysql.com-20100823095621-2w224p40jdlf1s6i # # Begin bundle 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