# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@sun.com-20100430092709-ghiuxzge5tbcno5d # target_branch: file:///home/msvensson/mysql/7.0-starboard/ # testament_sha1: d124fa466454b9c64006637bcc5312a2e81c0806 # timestamp: 2010-04-30 11:27:13 +0200 # source_branch: file:///home/msvensson/mysql/7.0-ndb-socket/ # base_revision_id: magnus.blaudd@sun.com-20100430091200-\ # 53znci6x4nvtqzgq # # Begin bundle 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