# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100504131517-61itprcj13i9zhdf # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: e75253d10d534c2fc8ad3d69df9e0e5eeef2d461 # timestamp: 2010-05-04 16:15:42 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100504125510-\ # gemcfhj7mefrhalo # # Begin bundle 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