# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100602115211-y3udux1qmrulsxcc
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 037f201b36f7343d7d99f3e2f556d853e9d1be56
# timestamp: 2010-06-02 14:52:33 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20100602113733-\
#   fslfv73nhi0d17t4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeMFzEEAAYTflAAwUmf//19O
mgC/7/9wBAAIAFADZ52xj3cidQEoiVP1P1NplT1T8mGqn6pvU9U3lID1GNRvVA2o9IOYBNMAmQwA
BMEwAAASSCYg1GI1T0h6nlDaRo2kGgDQaBKiajGoaAaBoaDIANAMINASSTIGmiaMmg1T9TSHpA02
oBoaZAUW2PTK9duCVz2GFVsALpmSwi1jq6aVVTb6n7mnVqlDWC+fEts2avP7EfJclCz0lUWRdqDe
tgeMEcb4deDo8u8PBBENwUBrUbM/ztfgLFoTrIR27xGWGuuNEoKLDMzMg1l3WgrB+iBmeGpBMQ5O
ZMmmOpTuh1BkrkStiK9jdNBw7K4b/ycX4iiXuQQjQKDPhYxP0kPJ0wjXdyVQpThplbJ5FQs3Fhnb
efTmI9uKBVIW9BEpLBgucG/Z0boKalq7E6OodFYYcxp8QtXUVBClchUTl7W026WwzOF5IkWyjT/G
iZA8rOtZltWOk1YrFJ3Uq9gPqC8cEqYINvHNUWGLws23RH1WoJ1nZMgltWhnPEHkp3XKNsuhk7F2
YO0DJZ0jjO8ulR0rb6y1QxHhbEiGV5LOhk+85c6R1M02JVdpSrSyDB5Y5NNoloSjN1FC7mZ9Hj2m
HJz+HHruWAQUaaUJFczojyXyUrlAbmJBkWgZYPQ+qYULEnIrUImZfG5Q7+MyKEg7erUQ89PDgIPc
9oZCHfba88eVaPKkRqYsbX6Hhceqr1hD3GhQdOwGHJYk6oO7tDhZpF8Ao/Ug+aJgb+kiRw4t37Jm
EaxFuXYvrW7LBG+BRSk6YMakDokS4hVQFxRkPe+0TsqUEhzW7TOG9dGOcGt5jPPRjnKK5sN+5zVn
5MPyiFJsip2b+m2aVco3noQ6EZuRPHq7ry02GVjy8JjEif3TXFTt1RuS1IsNwPdQqVkrtpkQj3Jn
5F6cXZhH7UeGzVC8NAzdjgXpsRHlsDBIxCkKXCWOVQhiCqlzxYVKdQjkIyWh2DO261e+pspCB4Cj
ZHRlqkRBnu9C33qY3F6HMmWfFIwgSySJw9Mx4iNAhUucyuxy2sycPjrh6RbL8lIS6RsLrEX9tu+J
TjJIosKQrYR1CinLhB7nTu3MU2g0ji2xTVgRY3CpVbmFzT39pCroXZE36/FcTC1Mzk9y117sd4sp
IKV8F1pjpwoLSiqsAt2CYTlerBY6yH+M+7/i7kinChIcYLmIIA==