# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110202065924-9yeppme4andl4z07 # target_branch: file:///Users/mz/mysql/ndb-6.3/ # testament_sha1: 0e19cc58ae5e4c72f226e18cc1e7bd2849ae8f4e # timestamp: 2011-02-01 22:59:38 -0800 # source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/ # base_revision_id: jonas@mysql.com-20110201083457-5kdjf5fs6c6o18au # # Begin bundle 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 3aP/F3JFOFCQc/GLXg==