# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101111131352-lhr1065yg9o902fk # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: b709a43a0c77eab089fe62576ae9214817402217 # timestamp: 2010-11-11 15:19:06 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101111112535-\ # eczirbgyl8mizbsi # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa4uvJwAA0JflHQwWmP//3dn nkC////0BAAIAFAF+9QocoNgHdgCosMqh5R6g0ANAGnlDQAAAAAAJJI0YmjU09TSaZTJoZGgAAAA AAlNKnpPRT9UPKZqBiaAaAA0BpkAA0HGTJpphMjIGBGJowRhBo0wACCSRMgRppoGSemgRM1GpjRN P0U0ZNHplPRFTDEU0W2XtK1fLyF4+BdOouly/ckEBasaWIpopk6DPZ5fsrrkKIupsWqm0yE4wmZv p80f48iQqrfVLGChSh1M46dVKvKI28Sc3cDwf7yQxW7Jn3vwyQyr9VFx5sIoef1v1dASmkqg6OYB 8jgLHCiGIwr936Hh9hfcBYxfc3CZEoty1rScTTIzSCz+I+8oEYdrpC5ibWLSIWQUtfQCMd1pZknc 53GqCFYDVcmWgYBdkAFlExMWkfboF1dmOAsJxY3FBj9tz4jJMhRwEFTFyeSUh6GwjbQzgNb1EGhF 2Vh3RPWS6jTEBZ3UiuNgZPWS5ABMAs8hAeLUZq4vEYiBskMZATiUXM8igug0mNw9cxSS56qbHFZQ ERgMhsl7HmbooVGS6N6DPXINeApaml1vBT5C/4rKRmJSkVTkrzmMcxELyeoXkI3CIX5apNGXRccA C668rANYsnkBUKRSIzFwCGURjdgPGNBgdLGJa5riM08szHkmLgvE4xJ7hX289VdheStWwafezUx5 qAqaFB9e8WGPI82/6xoKCOfwoFix6HAOGJit2nWNaW2zWOzERxu45Oq8bAVNOKA8VYzkTLUWYC3z 1kToK4ONGg42lRSvkVKJczcifZPMzFAx20Q6Ar1wFnsI7rDLJRe4cxCy7UQeVMeS8jqMrKm02DoW 3J49q5ivEQ6RY4QxFQkb8Lsr51K2wyoFTVUyx182NCnOLYsv36iWmI5Mxm0hpDGwiNZKgKywEw4y IimChmjOIoGgNxS0+4EYVzmgNxUep7M8huOR3G9FgrxB+BMfz/c9dKYZDEj2D5B9PGLw0BAPZiEe X2DxCnzD0lTxzw8gH+XnDGEgOCur09Kgw9zGYwGS+A9HP7OCOPoOvsGiLix2nUKHZ8Bw6gEdd/5+ uUQrs3xM5Ili5AiRLs7y0tJTViEcicETCucranHN+uoTnWmo5+8edw6SLmoeJ9PxgZV46zWuao/c 7hDB3isS9+Wx9Qsxw31RE+PMoS3CzCfCNPfHcb9zDCFgrBCqKOOhVCGlzbDEtPE6h5Cm021j8qJx aJqZBqtswp21FsXHyFOEPnIwkyAUCuA2C7EEN7SdDFrdCACWCc0mbTCUR0v12uZxI7JA2hMdMilT Km/cuNxjoUWpi84jgex9C7S408PwPCUSKqw6RMKu3ScunAbAvCYCInEwth0uKi6yBYb9AvnQuBDr EcArDzPUULZlEzl1hMafEXqWreg6VxW1XgaL8TApxMViZQXQOpKyk5CmcQNgTC0iySBILMb0scwe WorJCakDeuAFew8K3LLKNKI/NsVaxOJnGsQ7QCPQ1JWiROSIwFrAqEFQ4L0wQGBEDEITB0q4UFpP ltOIsPxg4sK0VrHkPaIXaCNp9TuGchhwzuBajMPJw0raetUkgokQwykkGYLWB5EkSeZHQPnqE54Z 0ThtlESMJhbZF1HUnDgRyF3K5CtDTQEooOgsX5EKSWCMXC8wiSK7hOY26hhhOCQ9faI9KLZSlde8 v/UQa7ky1PKkAewtU3wETOkqEjkeJEkUs1D1baJhcHai0k7lHBAopCoBYQNGGYwEeRGwmQYkA7EY 1uL0aBQeOJGYbhu+I6DQvI6+UyBoKaWItiZ4oOFEuz6xEv7YEwqMvKoV1QuhZBWgQwvEWFkBNA5A WHQoNqJcIKh89/gJY0j+LuSKcKEhXF15OA==