# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@sun.com-20091113191957-txp99l1d2f9do7jz # target_branch: file:///Users/mz/mysql/ndb-6.3-ndbjtie/ # testament_sha1: aee6d76ab44e336339af73bfdeacdcde439eae08 # timestamp: 2009-11-13 11:20:13 -0800 # source_branch: file:///Users/mz/mysql/ndb-6.3-ndbjtie-work/ # base_revision_id: bernhard.ocklin@sun.com-20091113130525-\ # 2r2ksvbh46crcyaf # # Begin bundle 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 G9A9EGb/i7kinChIbMRw1AA=