# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110608192529-\ # aqhnq8s8tcpfke1e # target_branch: file:///data0/magnus/mysql/7.0/ # testament_sha1: 07ac7054569f78770559d7b8f86b418b09474e3d # timestamp: 2011-06-08 21:26:31 +0200 # base_revision_id: magnus.blaudd@oracle.com-20110607132840-\ # jmdypw6pgr2z40jv # # Begin bundle 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 tVkedS52ruLd4nPs8zQ/4u5IpwoSDb6DC4A=