# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110322135652-c6w92a0r9lr69vbk # target_branch: file:///export/home/x/mysql-trunk-bug11766752/ # testament_sha1: 2a1af6527ec9f5c5bf15e7f198f82559766d5426 # timestamp: 2011-03-22 14:56:58 +0100 # base_revision_id: magne.mahre@oracle.com-20110322125752-\ # 1vcsv5j1ejhqruwv # # Begin bundle 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 M9Tp