# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100602103714-0nwxdqskeb1ihozj # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 08b4dc3d881c0e6b99e9a28e68c1674582713b86 # timestamp: 2010-06-02 13:37:28 +0300 # base_revision_id: marko.makela@oracle.com-20100602102637-\ # 2tdov7jgx613vrrs # # Begin bundle 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 EhpNhw/4rr/8XckU4UJC9R/ggA==