# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@sun.com-20100505131404-dc1plqd6dz0pmfpe # target_branch: file:///home/msvensson/mysql/7.0-starboard/ # testament_sha1: c2a85eb67b37ed57c09f87b6575bfa4cbc29ef2c # timestamp: 2010-05-05 15:14:11 +0200 # source_branch: file:///home/msvensson/mysql/7.0-ndb-socket/ # base_revision_id: magnus.blaudd@sun.com-20100504143454-\ # x1l7jgcpyrkw6twt # # Begin bundle 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