# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110620135521-lleos9qx77tkxp6p # target_branch: file:///export/home/x/mysql-trunk-bug12661349/ # testament_sha1: 039b4d3dc22e29a25c7fa5c5c0f8171f2de30e79 # timestamp: 2011-06-20 15:55:33 +0200 # source_branch: file:///export/home/x/mysql-5.5/ # base_revision_id: dmitry.lenev@oracle.com-20110620120706-\ # etqnkczu8doethhl # # Begin bundle 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 XYci2hgi60z2nIrKT/F3JFOFCQp43mSw