# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110110133445-wq8vjvm9ag8qsog9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: a07eef7bdc9f1b1227d17f4b86ec8286cc0eb717 # timestamp: 2011-01-10 15:42:18 +0200 # base_revision_id: vasil.dimov@oracle.com-20110108145119-\ # 4zkg7cbafzqux5gy # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeGhx+sAAZJflAAQWnf/919j XwC////wBAAIAFADzXlWy2lFW20hJIQCm0aYmJPUynqegmgNqZpNNlPUZAOYBMBMjACMTEwmEwQ0 xNMBKJomSZT0xE9EyAA0Gg0GmgAA5gEwEyMAIxMTCYTBDTE0wEkpo01PCmTUYMoEeU9TTRo0A0DJ kaOOTTM3nfvbCOtOkvnqYC26V8UHfvCerdKzMcMq/MI53Er2Zv19svALBV4Xtjg7zr0vs+JsjWKR pmYjqmlw4R2DLqzIOZYeedSGY8DZtLNnSXPGLrFyEVKpKVaNGPHNrAu4kjuC/xXOlTTSMMxGwU2b e7c4GEMLemS6q5QwXEM8IHCpkysbqUxPju4PEdbCgHRrOXfWAaAoyxRxKZs2ax4nclSTh+pojs3L PdfbfH0XBe3cyzMr3FDYQxEec1Tji9Sdea7qww7G7EQmW3SqGgK+YralHi5UqBNIGSqtPJ9LCoE8 HTaNLiBYTBAtVeLgjEvCTQndJ4MVZAmtIYUzqSkLQYE/AV9s7mTbK3RuxWeCiXlitYy0rZhQeoaw lJR9YYS0VuWpXO40UYwdgVSdOTjPQXiJgeEFU+luQVGmszECBEoJZhFIZaWIVBBVnw2LCrAxFyLF YEgjJakeGct7aayjrc/VsrpXuDFLfIZGGPHVyPhCLuPIkKEeRxLZN3ngHeOUBjuPA7zK7FgxKj6H 4awYPMuZdPA3dKX98e9IpOFbM76BzCyxh4daX877LI4ijspF6wSii7Qes9v13OVQ75lZ1xBAgsFH 29EfVbAHrdKTJ5Qu45ufSoA6a5jLLIuyZkhy7UjDaqRtOLl0OuuknprDS9UPlvTgqVM771NrM4SZ lRRtKSp2OvVKnguG9jT0x46WxdLKE5RXq6rN+VopDvqr6KWZ/o44gSLsTKrCTRZfJzx3l5OEifpn Wg6ddsPZcqCsyL12xwL3HUbQ9uAOFUJkbg6A2hqUOiiYcU2cjXTN/Ym44aiFA5LE2h48LPBWBIVU fG6yE0+RGsNZWn1QFdBNUl6bAtC4DENoSCVSQ4zJDLXEv5LXp98MRF4mySznafYa7Faka30jXK4H vGGrcqoKWwegPXYgJobGQLBHsmUhz4vZKMyUXisNCQ69yliYMGfIckjAOZa6lfpRHS1lScVsO0ce 0f5C6xZrw1Q51UE0lvJSJkRKcNBPNACdL7SgPekHJic10KKEyXohiC5p0r9BXSo0gcNGknub9Fdp VGB5mVt+eQ6MQYHKupS/tM8lP5YvJHA3TToZ5BNXBcFyvwDEXkL0msWwLEvlU440BfqO8I64fxPp /xdyRThQkOGhx+s=