# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101116133039-\ # 8qjkgv2imgy5isef # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 1418e6434f2236edce5274cac119e9900eb38755 # timestamp: 2010-11-16 14:30:44 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101116132619-\ # 8upi8v7yekd15k0j # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWecuvw8AAblfgAAQWOf//3a1 +gC////0UARNHd0Ha91bDnvZe8Mk0QjanqNDI9UzSbUmaTaT0wowGjT1JgSSTI0nppoJkmTJNqGg ABoAAAkREKT8mhTNNqammh5QyDTQYjTEGgGU1Tyg2o0ADRoNA0AAA0AAklEeiaaaaZHpGp6T1PSN AGgBoAAhHyG5nnj4CNObNc9+sYgsfsTBgrcuHCCM4rYhYwSRZkkfh4sej3Gzp9DbDx/ZW0unyvZQ 0vfZutHGnkvOt7MxqZVBlk0CXXl4eszq3JyQT8fqG+FsLuB7350gNAY1uiRgC0k1ZqIrq9doYgMo GqgHAK0hjGuPG+OQIUV2ae0gXZ/dx8uThPVk/kVnkJHSQBiQkXjTY6d3M4nsTZDgrDhLUIKEhGEu gryEMK5hnR1sqmUQitjYJBByvCHMsENCKn23vxI2fjs290jogguHxIfm+OyipKiChlyXi1xWFhpM jCFsw4b7caRclkhRdlmttCpCeLCaa5P4KYe5hSsJ7oVql1dQoHDV+OZE1SlNZzkzb55MVm518eFH rKhU49aeWG6bD7C96wX9w6QzdKvoGd1C5JynJ2s3aScgeoDh5K6tbUaZ8bslDB6uqttU6tnSqy+B s6aFSepZ6RIXVzjMvH6leCDgqRFWmv5bd6qlS8xP9abOsysmbmhJ3Rc1dbi1kQqTWNAiFkWn5Rue ls6QqWefY0kTAJcQoPbaVbah7kFqbj8m02lpva/D0+XSquK+Gt8LiCHGnaJh1qpXL50XVcB0qk87 Db77zb6bNn7eCwbqCRN1dVWBxGyI25GveWapFp66hgJ7iQocEkwbMhzsVPOYjIGxCyzigLz4uqEe DyCfRL/UOeSwMkdeiAfgx/UDdSjiZYdq0w2lMrVFM6pOM8dtxvICHbc02ZJK7VTLNezl1eBIxzls EsodpvWcE1xVbTQ1WkU07tWOGjT/TjPgm24HfTKzohoal/HFoEt7k2wOYlKwIzCwVJf1QpErx/7L 1CDRIU+2gwIdpuHKqg0A6Sl4QGGE1Ao1MiEmqVWYafbwprlG4cnqE1ipmZlnyhjcKUTj90UucBmG YYdWK0MZvnmKgRXgvVBamW6LWkSrJGtMwmsWEFZuCeFKtxRBEE8AVibZvWCxJF9IhMKJNDcckDNd EkUVpxDfskAcE0xUQVTCrNzgaoSkQQ5TNcSMHZQRDiUtvhYjisKisYwbUkLdq18Gjv4klItAfQ6B SX1klpLigVICIYwceVLT8SEAdMCG4DSfpv2GlmLMqggcViHBXVc4kX2+MUbTkcQYZOSTdzrdEgje 0XldQVN5b83cy47bLGtUjnLPwBWRYyy+QfVmSLly5WF2bkfPhUYMWCMc+DIGNZyIhedUlew7DqTZ isfRsokFqZcpkG40JCwQQbmranhgEouMtT6GiszS1gqbjjSBf9s6kDi+7EoJwd56O0xx4xP9D0v8 XckU4UJDnLr8PA==