# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110609092047-\ # q22hqu71hglycbwv # target_branch: file:///data0/magnus/mysql/7.0-bug37153/ # testament_sha1: 1a5ff48d4a9a42ee5b0bceb680716b4e63db5584 # timestamp: 2011-06-09 11:25:10 +0200 # base_revision_id: magnus.blaudd@oracle.com-20110608192529-\ # aqhnq8s8tcpfke1e # # Begin bundle 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