# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: guilhem.bichot@oracle.com-20110114131733-\ # bvams2ac7jwosvxu # target_branch: file:///home/mysql_src/bzrrepos_new/5.5-bugteam/ # testament_sha1: 0df56debc8cde8f3505661fcbe97567f09331ea7 # timestamp: 2011-01-14 14:17:37 +0100 # source_branch: file:///home/mysql_src/bzrrepos_new/mysql-5.1-\ # bugteam/ # base_revision_id: luis.soares@oracle.com-20110114111401-\ # 83o6y6bz3h11j5eo # # Begin bundle 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 U4UJD1xNa6A=