# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110518074102-\ # tuolo45ig285tx52 # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800-12551047/ # testament_sha1: 77c1e378929bf1277644c54441bf97bea1e2472b # timestamp: 2011-05-18 09:41:05 +0200 # source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # base_revision_id: guilhem.bichot@oracle.com-20110513141754-\ # 1m0zpn029ejl03ap # # Begin bundle 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 8m9u3eG9W2bdbO1sdlcNvNMpYox0Zp107zUTuuddb1ac9WNz6uZp3+gnNq1PLrWpzNr5c8ngp3qa 9b+Hj9PnPa25ZnfW7qrE8JSdzJzPSuuuYOxYneutk+eRebVJLVLK/js1mHSp1uzbssmDi4z0Mb6a 2m5gTZ9wwFBVI2C0vi4DL0FRmeEG5rw5LJpZWYnoJO3g4MtMV1OPzZOdkz1YOnPnVGfl5bWni07v iwdPc14q5WbU0rGfK21Fls5x8GbDVaUGwLWVhNmhkUE05FePFWNWiYbbnha+M4C9O4S2iWjJba2a bC8AaacvavEhO5z5b2cvl05tjRk6y/Lj/c81PW4t+ldFueYTTlubWVcrYr8ujg5XVlLqWvN1c9N0 59tU3sz5niSQYUSR+CiJ6vTfswSJM+XA+vUt3cLdFVh1+VktpTjdaLZXTC2dWjDHXJnpXvP76apa x00OphLsC5yOpCPoigf6KRRPzWIsieC4qiCIpDcmhhhKKnNzh3dsSioYR0j9an7eUT1uwgHYrCez GN8vBerdqIYIiOxpD9xkSNPVhI/4MkwDR+YWqE9s/2WJilH8T/g5HFOdFkoumMsnHCI/WHMbpvP+ UnMxj+BuT/4Wm82uknFH757Dm+o4ajuLB2/w7TrkyfxSZmo7/A4yTknQbsUUclFOeYFpxMCZdhoZ Fk90x5qnc/3SdKdAd8dDjM/3BhJO8cSyOOhbGkUnFpAuS5UwlGlB9qpc/tY46TQMrpma8E/vTotH dkvqT9yOkwnwHE1mUmrQtG6RwSdyZOiQ53eHpTW3GkjpklRKNqXRync4FG0ydJbE7bajgmyYyyKT n2JZqTqOSZ7cZuNkmxjgZavE7pqO5k6Wwzk5FI6zakcE3SS0o1rGszRmSR7Ogf6CfefsP1n6yfsJ gfsJmaj8/lwPaep5FHXF3idHb1Jj8g/EfQWLCon0v1FfpH5j8xKGIzC4qJe/+tRklQoc5mNQzLGA +yJljUuVd/kflWlpaWlLFllksssWUWUsvZZYwqZDaNpc1FirFFjZsieRSGMi5tW0FahhP8yYj/AX NZKEoMjM0FixkRi0UpfVjmYLJqFWisxrGwcBguLJMDV/lhI0KGRZR+ossWKG6ZprGgbRqG0uMDJF G4YbBrJOIcnIpRSilhZLKUpSksSkDNISgfUIj0H1kolCkokUFiKKJsPil4PxRT4h2ROo+c6jrPTL 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