# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101128121549-t3sq7k600i2byusd # target_branch: file:///Users/mz/mysql/ndb-6.3/ # testament_sha1: 609b4308434b756c3078687b0dfdf51e5778859c # timestamp: 2010-11-28 13:16:01 +0100 # source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/ # base_revision_id: jonas@mysql.com-20101128095839-tf9m1vkbxl6yugwv # # Begin bundle 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 Lsqk