# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110420104727-utvkhnq24qze1udr # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: b7668d0f0dbdbb988a5a1e15cd7e376adc90f593 # timestamp: 2011-04-20 13:47:34 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110420083348-\ # 79im2vuncn3qd7u0 # # Begin bundle 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 GaP8P6P8XckU4UJCvViLUA==