# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110421010746-iol3sprv6grehyx6 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: 09f3756bc222805dd8abb40f939c0bc0b7d0afe6 # timestamp: 2011-04-21 11:10:03 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110420233524-\ # s6v0p1zs8x50h66i # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXU14tAAAZTfgAAwUmf//3uD zCC/7//wUAO48BWJQADJJpqmyaelP1TeoaAnqHpp6o0yep6hkZPSA5piYAEwATAACYAAmDTUmKbR lNJ+qeNQQ9QAHqBmpo09QaDmmJgATABMAAJgACYJJAQAmI0CaYjSDUNPFAHpD1CX1aJHbfYI2xcF 5rYADFtsqGTrUMjnxhOSR74JBeQzmiOxky8dG8GO+fD7w27nZm0uaFVuMxFCnCYPbnsSrOewBRAn RYldE9N8uM2x+ExCDcncjk54aohPm5Hsymxq9LCM04R5w89dE5VUxFne6k6xiLqItTOnIeuEBFQ8 hEICnlWnp7ea6li/1Wq4VZ0tFlUIrF7lfk8Ri+D1ewzYuosVVXevQ+9WZV6L6fPqWVlbLnlYsDUb hEnrYMJ2uKbcmPpbWrpht5N9kVw7vC7fdGLLbhFa9fDKTLi2m3KuhXZvpVPAV77gxksLtTx6DDjd K0WujjDupCogRRwWq2i+9uCeqo34hRpvpJqj5YriW/5cS2uLxOdtgxDEzISxt1eK2Kc84p6vtrOg rF9VdVNk60IxDRSUjWIPRQkjmUVySAVCml+kQN1V/AlaZXDUYJoYo2kS4dPWW0TtJaq5wfBo5uIO TSaBMGRKbUl1eLcIYw7BCKKmnx6zQSOU3VMgREVr8/pXyzpC+Rxk6ejLucd7kpfN2XCjaEAoXujG yVqwPLQapBi/k94Wkic3tYaKw5gDtokBHs9cdltk5F12WBwyNcX/q7dgIsOcT+F/AzaDGsVqZfn6 rcnsc1zTaq48Lj2c5IsEX+GFAYcnc8anWK6adBWQP0VTz2TLkSwp2nZmYFMj/LnaaWnl35RVIqWU DVMEz6qqHimt/w9OOmYHRk7JUb9qDJ8agooXDJpZwbCg0KEPkEKF+3TTeczI3aKhzhxE+pYflv6b 2LerP7MWI3XCwvTbAz/6yv4hSK5OHaFt/kmuUuOw2dWIF2XQLr7oAvPTGV4s6xlWrw4+kOW1bEzb Aw0D5imE3g3Hi1KQxCjPVTO+VMEitT8sqzCUYFMSAne4iMAgybOwAeChYosnsmWoFu3SvvkJsRHo zxeMHsewjcFS7OV0c+qz1syeRnl+sX7xdrNmbL4qEvwv4+GfcKFKMb5uK+WMrFrl4SyJbqSidASE 9d0u9u9cVBI5Ubq69T2oa6oGmvH7CpwaYH9H1GceK6JiHyv1UsNo73GxdfCRk2qjZvvHuqCsIA9y zyz5R5sH7lKRH47eakLfe1qZGxsb3evku8T1PVVmz0hsEjsKFRP1X/i7kinChIOprxaA