# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100525121038-ttnovwh7njl8o1m1 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: ad59718705d393b28ea0d10a8c2cce9eafbb8264 # timestamp: 2010-05-25 15:10:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100520130734-\ # ueow9mn60czp7o4m # # Begin bundle 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