# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110331152343-09zir6xtefyumr82 # target_branch: file:///export/home/x/mysql-trunk-bug11765416/ # testament_sha1: fd6c177a132ec0f59b238172a768e2c59a7fc6d3 # timestamp: 2011-03-31 17:23:48 +0200 # base_revision_id: magne.mahre@oracle.com-20110330141702-\ # ct75u2mrtimpskvj # # Begin bundle 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 IpwoSDJNDxuA