# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110419041707-3oog92glj6phimo2 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: c7264d1f64f95579186edfd66bfea30278a5139c # timestamp: 2011-04-19 14:19:25 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110418110937-\ # pm3x5j1i846m4kog # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTVBIMAAAnXfgEgwc+P//3// 36C////4UAU01e6oo7ssa1lBSEkkaBGpozBTamJiammGpiA2hlNPUNNGQaCUoyDQKe0aUyPTU9QA AAAyAAAASmojSQeSeo9TQ2iPQm1AA0AAAAGgcZMmjENNDATQxNGmTEDIwmjTTCDJhJIEDQCnqegj Q1TZNT1PJMgAyAGg9T0nqLFgt4pNKor/sVcMGbfCwYrzxkRc8LZFbPhzliJRGMVE7FixwvdspFSb L0I6XCXy4MzDMvDbopd5RXNtMBW122ROgKWwQvhlc//Lzv97jXDj6fPXkfDzbLOhMS1/ff3bWPG6 +LGPzHEEz3bgnhHI+yiswXbd4Pwp1iq/aAehpRoBunPz1blR4OWagyjQcYvJC0AeIvXgFR15bor2 X8zLLj2q5FFUmCS2JJ7DZG+2mZ4+SMiiBqlO/KTDVDUEMdxH16kdQGBSFGHEzA3V0JgZOJjnnaLQ WCJJqc8QB8GhvSoJSilqAY82x7Lkyp7AvT5lfrodgnxisAsw9TwpeqGO+ADtC8YCRiMaW+KoN3QV vYfQfitQTBibFmOuFjZEbaMIDDAWUumH5qxI7FTIYj2szfcIpN9euiDpw2T1twqxxTtzZRmtRSdv scKJUO2kijcB6VbU0CbgzMXgiMDFmRsLGeaXJhpiorLS1X3xmz4ozOBzMqiVuCVSdcvB1eJz2gf8 vLGZsbpHi5kMFFj17mKqW/ULaJM6MGLlIRJSUdYmeBZe8lICCdQgg9K/acbMvicJ1OOIZMbnaaNJ 4mgJlgTNCO+LzgqoKAOYgVus1CdZPLOuQqQHVb5ewDBS5RQx5WLbx1XwxKS+x2jp5OH4NIrWx6i4 GjZ6kQxHI14UvJSHYtR79emwL+6zMaSCXFzDlnwCxNSyAuBwE+JSpMksYZJtQw87HeD45IP9/gPn sLDy73/xMvajygF3hiGgijxD9KmKApDy8WDEdhYSYPgPXiJv9tCvcQD8qrBUSxt5AvFssqvGFv98 6jbF7GOYdOMhINEM0lBxX4gikrTD3OC95xkYh4+/xkQtPILq1DjpIizrXpJH3bRKcJjVfhRynag6 VroKYuq6lEvq9OGJ3NNuC6Ck3juZ3tQWCnz0WOee4BguAVnbGBJeO4sF3jmFiFrN8NlvBNM5wleh ZQDIocRMufQqusCIWjtkUamZ6xaTgLgsOchkd9o3ZWqcZlA3fAANINj4LY4c0VGC6cJkKTOZzFaS p05MxfBUFCagc4MMct3BYXlUaVVqylF3OINNM0zMDW00ZuF4ZLCEmlRXIh+qMuC0UFFu8YTGYdkk gsnBTXznA9Bw7gueV7m7ZLsA2t1syHO4geg4C5gq+t3nMByiYCcX6qZd3ZIaXicF17BQPN4GvX1o vkrEj0trfQiWqZGiE9WlMBaVCZp1cqRWuJYQmRK5LpVYkweqvvAy402cULpXpTOqWCiqx1hnJyCE FB90RzBjocpTFEWDpvEDkikTMDLRI4cymBdUA9aIXFumpHd3gUntQupEwNXKcc7AsLqYcrDA9Udm 0DRaWt9lL6tuWuxl9Nog8GR2LMpChKzosVxZKQVLlfcQUYxS6hIensxz67+we5kFFEe5OMUtOEiG Iwm1i50xpYaUnZlcHqQmFtI0w4w88OhP5Hn9BmJ58cVlFsA7W2Mi+Ws7ikhNFoQSi4O7XkPZsPo+ rsqS/EmgzbgfN1EhIzwTIuFFnHKnI3olFndyMQCG4q8FdSmtwn/F3JFOFCQNUEgwAA==