# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9 # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 93d4bfe144a4d4047bd1b813f1bb12a07408ece0 # timestamp: 2010-05-11 13:45:08 +0300 # base_revision_id: vasil.dimov@oracle.com-20100510132852-\ # cz457uqvj8iiy9mm # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXc4cJAAAbJfgEAwW2v//3Oj WoC////wUAPZb3QTsE6y4hJRJgjRkjyjyT9TQQ2o0Gg0A9E0aaDKppmoybUep4oBo0AAAAAABKCA qfoJPJqm1PQQeoeoPSaGgPUGgBzCYBMAJhMJpgAAEyaaBhJQKbRHoTTCU/Sek02qD1NMmNQAAZGD 45a+javHadmyCUFSqvnseAE4q3fivJT25FsVVTj8U7oTMmVWFl/cufpe74XO68cCKuvd5mD5/Jg1 ffW2nKX5vSp5AGtmeQZxu0iNx965eg7GTg64gtCGUJRQZC+A1neIUJYUsrBCTGTNWH4kaCH4EA33 CXJAUkHO6zWIYg3A1RuIOExBaThWPdoGDVwF0mfaGSakMFWm616BypcJ47/WziQEpvmFxKMqwikb DYnM8DwZVI5Wysc6ceFZtOlkbFcIiTHcPiPH1jlrJweHm2d6WJIU2ETM1lCkUwc8JEwOMR0B3RXo Lnkw4bkKAv8ov8ciRcYBI/uuWBC4VKDLBbz0Dy5XzJwXhHUWhLWbf4KEKMRsmETXRViMtCJStoeT xWWGmkLPfQ1aw6rk8xKUwxMCKqraFPmByqVZjwifxLGUWqpmC7CELVBiBppElHM0N6XRwmRTomlk hMuCNJwOuHWq7O0oonvU2597UzUL96w4PjWGXSUWPPtIGNenJc2hMFtwwpjGYflu3YyNK3Zvi/d0 z2vxYZS8WVbrxrGAy/57YE/AeEx0BxO5LnedXUIm7T1D0qiAev6JfLYWQCvjOLCKWaYtFHYHWcpy 8wDA6ed485CrhBbuvkEWlIX6TsDuF4BkFgeU3RoarXMEM0iKYKRwFVQGoKE5MnF9YhAtNXALilTf DLNqYkMUxvI7jmcxV7NBEtwzZqHhpM5HGbK12Y+gN706Yh2GPRUF9OJpyNkDQK4lcovBU0y4jGTh UYC3LfONzVz5ronIT+yorrKQZGxSLlpI5tQrhTE+0ZhaA8HiyMCFrPlF1EBAhBaAIlF226WhnlJM 4UAOFjtkUieSbdEMUVjsD8ugRYlL8GlMmUBeHYSH5qhyqm4HHnDRtYBidkQgD2N33uZu4ukDGIYn O4AN2YJEEG9yP0IzCK62qlt4RRv7xNdsPVDmudzLihJAk/uThHGM1zPqjFUrwlWFHCyAUt/qnlYj 2nMCycj1CJBSDIxmvARYCrqNHUoVTZFUR5Jza6BQMFKv2b3L+YvWxUlj1DkgmirZSCpHFzh1Nz07 U3UTOw1kvlkB6kr4GcJdOvDNckZtKruSXkFCUv5zUsmCn/F3JFOFCQdzhwkA