# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101202081606-c16tackvg7vbqvi0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 04976458c9023d5043fa77f337c3b9788998de50 # timestamp: 2010-12-02 10:16:17 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101201130902-\ # q0g54ufii06or4oe # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZtxZwEAAclflAAwWn///3/n HxC////wBAAIAFAEZngC2UoAaQ0Qp6J6p6PQU09qNqho09T0gBo9R6jIepoHqaBxkyaaYTIyBgRi aMEYQaNMAAg0QaJPEmmptE8poGhoeiABo0AaABxkyaaYTIyBgRiaMEYQaNMAAgkkIaACaZNBMQmm mFA09EwgGGo0QoQYaWA35CP17pg50AnlUzaIhrdjOgKXChEjscSrBmnllMzAt1EPhV88phpyJQhS ArF+/mz0iLO+j5gX9uNEibUjRwLWEirBGzTQiG+INag6ta/UY2F7uUJfj9k6X3H/LYTJkpDcQ02A KMB4vk0RxZRObt9yHY7JNMet1A4MRjmVFfCKvmvyXQJ64XZfTsXLnv1aTU60jlVdgxzERfCqbtIL tYGbteOZ1wlyThGtPS1rwuFXFSCpG9SoKIgyhoRfHvXmtStVjI7YiPLqzOmmROe4FjK7sxLU5eJ3 x1T2ijZ7VkLTxp77Cxlht28d5iqdwiKDCAtJsY4jON+Es8sXUq5wY+xvJFld5F941Ke+4oV0xmWo mYxVG5lSSy4zPoL2HDZTWPIFkVOYk6gqY57rrWNvirHKGxeRTcPcFoeqNeGd2ZOJ8orR8l2umSVj FUPoovvT3wUlx6bFAXKUlLOitYUyF5tiryTatWGCtq6DYKaiSfNbk/ET1eXvJmtgxGHpsnt2EjKd TbtUKcHyKrVJaIC4EsUTDlUqe8aIBBYaojcbQ8BzzkTKs3dg6AdubfcG8qE2U8fJMWx4IN034zBm aQIyHTcWq261hM9tZJhaXgx9U/+/kvpdhhKPcp3RTPhJ3KCrCvzYscfXjp63auLB+Hxgnjg6V4eG n3CPtPR8KRe5IzrpmgHfRcI9udTUtM1J4CE8IIL9xUnERiKtL0FXuFP0Kmr7Cg0Bcwu7XyAqrrzb BnbuwTK5cT3CxxOSgYLCrWn6l7T7c7DL1jmcgHqf3pGtwPrZjg0sXY9btUJlImcrKsVfB9q9xZXw VfWJcLGZcIpRAiZIzMSpZcQSAXCMi6KBHp3heohFm7nqW8NdbSHExwJCuzi+O74S6HdwgboOi2dV L4Ztb5uPBI1pcuB2plllrs02QyjjNyqKKQnT+oyrWBu4kl/Vmt0pGwmXw65zYxuY5MzOUpSshcUQ 7qXczaGS62CplpailE6aBbp0g26vb2XK10+RHNScHJmrxmJs0P9i5hNqtOV5Etd3b9kbL0NG24Nv O29o18pb0y5tiI89gbEiAo794Ug9wlthybsmSHDmIVklRk6Va5qJ06jgkMJm6BGi+J2jO34K3qWh N0TVG6uL2gPT0MPZzKu6EFg5yJGGZm4sQTH5tLkNLCEUMyZP4dP+xcIbNNnj3qrm+CSpF6tU74SH Sv6SPQFq5OVld/jX78nSaMycfLri8KZpdq6hbd7IiIHywgyJeuoh6HSJEVfhJU5DRCMsLBqWpW5K WftE9ApO7GVcAGRK3HIMmIPF7KoWUU1EIO/oo4CwNpC7AxY2DK1ip1dw/opCwIKRyujjStq5r2Fe e8pU9c9tHlPb5CuD0C+Yo6BVFg1LSBRulhUHoG/wo7f8XckU4UJCbcWcBA==