# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mark.leith@oracle.com-20100630091104-yxpjqu3ruebif2jb # target_branch: file:///Users/mark/mysql/mysql-trunk-innodb/ # testament_sha1: 95c6e02803ee735bb026df64c4a01962dd36eefd # timestamp: 2010-06-30 10:15:04 +0100 # base_revision_id: marko.makela@oracle.com-20100629132105-\ # zzdqxv00w8r8hq6r # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVVC7hkAAaNfgAAwWmf/93Mm mIS////wUAPZb3ZK4VTraYEkppqZqngieTQZKZtJtNSPSAeo00bUaDKBNU9lT9MQk/Sh+oIAANNA AAYpoJG00FT8hGnpQempoBibU9IaGahzTEwAJgAmAAEwABMElT0lPCYpp5TxT1M1NlB6hoyDAmgA gEA1KDDomVy+Q+ezV+9BwVAQ2yFierNjOiDJmtr2JIDx8APJ9SEkZug+bOUOPSOWoffy8/FuVsvR /GWGNWl2hiR8xL2R+mY3a+hCzWrPd5v5odgRK2pSnBLCqw6hGehj8giB7DaaSdDRnZlqB5DROB0E jhcTUyxjBtVgvQUvTMIwF1/ifwEcigHdLM8gsLFIIaNhOT5SkZXiPTKHA1ljaBbW4MqpZvBHb7u2 AOBwG0X7Y4g1LY40elk1tLlnYJH7c1QEdh16emVk2jbQUi6+eU9oKUCMjfbaqikFRjcsCngjWRVt 9Qc7wZOKnssEq4JzF4ljkUJ9gM7IDQTB4F+TqkBZk7oGss5rNJcA8VKjx37TkExmWMaW0QDRzenE BKtxnQV2Fi2XmatOURNRhhpmVXtjEwFiLTGw4nMcXanND2AJRvH9O4bhViDceaLsdiclXtGsRoH2 iInHU+WiIQUrqUvdHLIxxj5XJpWkIA+DQX1NPwoLpsnOu386Fy1rmlPRAGPPU6VDxzBMep1DiVHb DQwc6XG95H0doNbSBarjvT+5sOPc48uKRo153BUbl42WP22WTo6wQuXsGSbwLoMVkWK0mI+Sm0Vv lxExpFSmXhfIZKJNepww0Etzu9y3sSN1CRdLmMM2F1iW/H25Q1iIvqMimG15YR6yvmp/XdtHFFvk uBDFUKl3LSwLpy31xb85wnxzcDKKaYJ9YMdWdHT6RnvaCubdTV6XExftVf8cOJWNg7ijkrNcN+7d tKpQpkwZP7FHILd79pv0bFePkOt+N7LIi75kOr7aWSa1FTn3qZGyMfKTW5Jn6xaixONGxXhRHLI8 66Z4aA6AenAqLXXWikFVYVgyTRKsHLwfNkoSBNEle9IYzJQqv/AthBLJIkXQ+41uploU8VBbCN4r ULlzEQHCH6IEuavgAiIuGbAO2LJCFcAiGZkyvuvVZG1GIFCHcziL3SIwxOWYcpoBQqiUqdkkXCPU R4AzrwlP7GXEHgdOvSfgWJPZ3CCRF097hGrhEkMaNdFwRjAcQYgf0MadSGoQNS0YaaHc9ZgldIQa DhjvgSQR7L4pjGvbQETXGdmpfQYTgRS191I0cAmUGeq4DpGUWeYPETFmYX5wpE4GVG3e6tNQpwtU p2mH2tzHjdFcJlYoLOgqtFVsxWsg9f8XckU4UJBVQu4Z