# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.skold@oracle.com-20110622154141-3ve4zp1b1f7j17yx # target_branch: file:///home/marty/MySQL/mysql-5.5-telco-7.0/ # testament_sha1: eedd7a0544ca2e0ffc54ea99f95ecfe99435d78a # timestamp: 2011-06-22 17:41:45 +0200 # source_branch: file:///home/marty/MySQL/mysql-5.1-telco-7.0/ # base_revision_id: martin.skold@oracle.com-20110622123508-\ # h0gyuxr5qzogcekp # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX7OmvEAAhVfgAAQVGP/91IC GAC////wUAS+6KARBoNNaYZJEaeUzUeoyGho9QbUaDQAGNDQ0AGQ0AAAAAEpqJskj0RGKZkaaAYk emoxDGNDQ0AGQ0AAAAAEkhAaCYCaNRtTJoUbSM9U02l1mdTHz/5d+cccAZuD6lmwFRVlZCWLneKb jl6lIzMybn+Qi6MZNJJJYq0lvqRx4nL/PP5zkdU5nJ5M6CNkzpx5ZqN1xB7CPI48dM6Q8HhCqA8l 45HSK50dvz5BtTYU1Y5SR0NRLBPSGWQ6MDQhOwosiNbtwNWSW4SSSlRYMMPgHfKIPBSKuNxSEiY/ ETv0thmDKhxT1F4F23hkZmx2G7yhmawgcte8XBksCa9raq6ZyWKvC0D7Kg6WTzcLQGfwPAGUCQPW Q7tMWEQLTA5ZwDwBVbxCdw5JWJEQvSOQ5OMtxieB+tOX7zkROT2fBUcjufRH0nuN33VyGpg/kV0J 65j73kxRG4dJKqSB3L9EELCQrGqtGCsYB4HFVvcMQMhtNoBiplWOArhTWecuAXqWocMcGxHBARdx UIVyOIFm/pbRQOCq0ufEbRWW34vCeWFJBIeUfRlM1UDAzbCmgZZEp2M+5iUSsqeB19KpqizEa14S F2JOOMYlIF2YF8HSLFxY9wY2U5RTB8ZG0tqqQVRUczlspUwtCVal+auOWUKSvuVEWDZJneYKE7VY q60cW18OoyHA1NMRt5ntMZrygJL4l3/xYeOvuEhYZirNMPPc4UDe/ZQWQ4wree3M4/1qJUy19SNp KjsalpwH4F8u9iX/FCRWJlkvXzAxnPIDt+xQMoG2xz+5uk2QqScjQP5nUo2Ntfn7J09WxU5hLO4S j7j7C/pcRPbiXFbj3OAfE1IPrJkUlYKAFx2jyMjlluuJRVj87FhhycAU6xzvzH/IEupRliN7HobZ d2HcCdEfawvfy44XoML45DbNGk/hQd8QX7C0oA+gJku1a4LaHrEhRAw0shyH76B8D+hQYw0MZgId 36nU6LgvsexkdCpx6l9wwWJGQxut/8XmONhZlLry0NTKY5Sia6OyGm81aaCeYshUfhFfCr9cb5Jk T4Ip+CHRjTYCUxnGOBuZmaP3SkN7mqqPpwbkqIPCgkYNCSHmhTERJg27G25x0wZWFsRLVHg/KYd5 qJIbQtO22miHDIQUEDIKkqJjWEDic5FNPn3E+scgTxg5jlkeXLYxuz0912QphL1GliKTzKA+hLqi tVuTXO5/NhITkKQMQr2YYIKZZRxKBZEaJTopjhKAlorsMz2HV1MYBELhPYywaV73LNMUU4UBuBKo oUwO6NkZlOZDraqWifVQrd0WSF6RUWsP5m/1S/tyM42LCIE0lhbR0+rI3URsCa0wZOhqmgGow0sG Qp+JUitEGBxDInHnZgkKL12PgCaEi9zJH3OhNCXI3Pgc8HlQGqpRerj2XovUDgXUHAV1gD+LuSKc KEg/Z014gA==