# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100624060929-z7dj4btnkyhqm229 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 65a5873367338662ac0d0b614afcf84d1084e23d # timestamp: 2010-06-24 09:09:36 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100624060842-\ # bkagpd3u6qii6odd # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ4Im0kAAlfflAAwWnP//3um nGC////0BAAIAFAE7Xpdband6cKSJyeEkkm0JhogwJDRMxQAyNqGRoyGgSUmij/RFPU/SmT9U0ZP UAAAAABoAYo0mSbQkaA2kDTQAAZA0AAI9VTygekNAAGgAAAABo0aASSRoaE1PBJ5GRpTATRoG0gA AaGpnq043+A47vh88jG+ShE+Wt9UBKUyxyzxRyPc5uyO0rKQkkgMu35dwOjRKHppVtBysT0H5U9m gv2keG9ui5zxcZa1J5OA7/5N3j/O7E/XkRaL4xrHBKwTvpY+RHL0W6N40w/J5twzQRdjkaYigFz8 KvNRmdxqF+UL7i5BbuCzivu33SFmLgIPsL5Y6dSE9uQNqA3nNIXmOu7TZObKPXMJaWZCtuQuUUWG 4mHiiSLkKMeSO3pE8kTAy2E5OXYlEnpFif0VYpWKRoMdEELZOdu1lJPkRfSwpQohstigHYt+NNx1 ixFfG25ZnFg4WQmUkfI4ujo2rahY5nkAp3FOTkh8c1yNYDFItkItNUqJznZm7BDZSaiBTUmLNTh5 HEq3wFYQMxJmGFVkUY5gKRc4mo0JmZUm7UWqyuYsoEnkUw+fK7VqNyJpFxYrfeKlWa6hbDgSgSYW ERABOJqKojqi+SVTPlIGFXm34S9fawYJuIFlwrXFMigx2ifG8tfLFai20NovEClSWmqoiFq2iqHL W+gtK3RVa+VrpCcpcpxOHAamHR5GoB8RWSCvbdM2chURYLY6AU+zpbJDBQXKN5wvxVFgM3mDgFFQ MiIyVYqPWsfge3ZgFLm9hFEPLdxvgLES8V4LKGdmZk3fOiLdH0GkE7Dp4HiMyCPDYtg+NqFopoUj D2hJP4plhxY0GH0TkcHZdzw+tXHkebDtJRe+jf0CcOcVCXKdfZN7o2VQlsqJ/S6zU9Hatwl5nF+B hJPdUlDhOJQZHfxF7rx3qyOI7IzF7DGmM9oWTHdMBnj2gMVC4hOxCLCPwE6ForUqxaPIFpe7Opwz CV8QuCSdd0Sw6poDF/NvXRcVy8gShWOiRpymBZVkJlYLXvGqGtvzFcsgKwrow5q8elF4RVCcANu2 Gh87pR65hh5uLSjb1MOpJ0cihFzdsCHs20zVtZe2mDNq8XHpSXotO2ljYsByGKsXdWjJmv3yRwLY CfMjwfouEBMc51a8DET+CpX8Oc7Bixgno9bpX9jPQdtzHKYCiXvJvErPACWqAtsxBYvTQ4Ht9yGk 25KTzVuADyBxF1IssvpqUkPHZfNXTih8ppRy487yi0DqNpowE3STrgJfvWi1JUzAYA5GpwMwlDx0 RSJMDUG5sOmKKDxQeJaANwEskd51ph2+1HWUmmUlg6g1lUsikeNGORvHxpFoRjlwiFOBYRzsiASj JzClcvR0YcycJQHRzVqytNagHRi4a8R5of5CTkQRscujVtsuaPUs+DDB1qNRS78jGmeObnzXLpAg P2TX0AnkgMxNc6sbzKdDkSZEUsJwIZgSihYX4cJbA07i9xsqESEKIgYsdtcBarxDLIWFauM32oWx s44hYzjIroCGdymhRUNdcBtqRSqLoRZphcDpYbGMoYK6befrVOEusXbpzXYrKQVWm7zxHZlWlEr5 EnidFxpgUwWqBjmm/I/xh8f8XckU4UJCeCJtJA==