# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101019064438-gfls1n6fign1brrh # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: f7f48481e242727c749e88921504ffa55e90b0a0 # timestamp: 2010-10-19 09:46:05 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101019063514-\ # k63rds85sj5o0fdd # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXe4sF4AAdHflEgwcnf//3cv FyC//9/wBAAIAFAEbPbJnO971KrpXpt4SURoEwqemyp/pT00xU8p6Ypppo0eSaYgNGgMlMJkyNNK eUeiNAAAAAAAAShNE0J6E0ZU9T9UPUZPQI0DQA0BoNBCRA2hAwmBAGTBGmhiNNAyAEkUBoEwg0k8 JgSGhpoaAABkQwBCDGIYBmz9VvX/I/HlZZfrryb9e45YZ8CnC+GAIcWolxs7cb5Rhomnfzry34YK qobvkQ3flpurKoq01ti40eHbThy6bV7F2eLFNa9fXAbRni/2aSb5DWNylZMbTVG2PZKWbvoiJiZx 6/uMc8dhe/Hb2A7BMpCfrzhHoJPLUjL7HeVxxzyryEfldCnQWX7OgLn15VX6ZM1SlSM2SRr4UZ4X z6XOdUTFmYKXtEQiINmjMKIa5J0VZCHFCEulWset1RU5ItXb1JtDNLxKVThBuRRDnUQh5eH6NsHN gaomUx2c01EV4V6F2myh8b+S6t0Iip+lk7FqE/YK59LLxF0ENcvOqmhbuZxRcRGL1HomaXhqsToh NKYFAyTBHOJgGMjVQcYWqUWA+ug0ykxpKzOuZgSHiwvCLWGmmpZKx77UWp/2F4YYTT2XQjDpBhVL ND5SMlzmdMG5eLXjBUjMQDFXFyYmxpeGLriXA3M0DEMpvGYCk5YwrnMSkLbLby8kOXArGExkYKBV GhbYS1lz81JQC6pr8leNEMXJMixWJMKprclnUZa7ygIGLG5Mr10VRECnnEIJAfNDzYptiHXv2rO0 FLUZVvuFrgtXzB5273Oru4OXnCG+HjMuuaYkUnMJ0YZLMbTYNoSPDlD2WJFSjJS2MJIrDgkeuBhf WQ40InD+sCwZRebIPg1bSRg/pT17vRcxro/XpF3WJEfZ0pML6lhV2FIMshKHadtJ72vUq/hHMYw2 XZpR3SLkjCrM1GA3odw3Nt4Y8M9lqgSJ4lOblc53LQGgMloxloR3KguSnniP6+vabGDQVO9hrKMj jp4brXk7Z50UaAvVI0b7n1PA2HPdxzNnLNVlsjZ/y5PWkd7g8WYuOhbQdS44WY4ykHOzQiVEqJFF jIbQcmC9ORq4PdqithSiMJjeLv58sTOLa8RwIi4CPmLXSLEL2boDT42pksCeMh2pbtRjmnG+6pFn bhoZoDpBMVOIFmGFRXD153SqsMA3743Bisx6ZTcwaczGZO9wOTpH7vCIF0BOEHAM5w4a6khjLKip 995EQFRLBI6kiWxrdAfM3itpsMFuzIuNqR3GsiDlHgKncE6BGJSigRMq70+MrwSZkmDDZqOp0jrD XPiUYRHQkqRbIxH0JFYDQFHMovufuvAoxiMUQ3lQpSpTGZ8MCjmokqWDsC83+FJkpRXXukJBWdMw BUskUOU41tooTzpmBi+TlcJgyy8Z61Nc5scegLH1BBUwJkXUQa6hAVYSSHsLoDrBSyhepGvZZqHI lgWpuxaSKByFwhJpIyNNxqyiyxEgbSEUBIKAEIJUTTWIN/Bg4fxdyRThQkHe4sF4