# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@oracle.com-20101111131927-\
#   boaa4bxulchos12r
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 4b6bf4d33e7bb19fe02c5475f6fc467f12b2eabf
# timestamp: 2010-11-11 14:19:31 +0100
# source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: ole.john.aske@oracle.com-20101111130741-\
#   hp0c4rtqf4k3hsy2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcs2JNcAAWzfgCAQUGP/93IQ
kAC////wUANaecOY3MdS4SiTIUzCZTyT9J6KGDSeo0NpA0ElJijA1NqbEkZqAAAAAZEDKBDUxNNP
KZGgyGQBoMAANAAGTQAABoBJTSmaBMBAZDU2phE9QaaHpKgRm0jj7iOa9QllHEkIS9eiC52u3Z0R
By8x8xm90NSNiY70lWHtlBp7/zT6lqerlBZKCuumRdwxRMLqvgqMxDM8dgmBSHe9+cVtb2yfkZoh
IyIEeIhZr4Nmc4TRNc95xMuQJ4jGkaTe81SJwOCJT/IRPSKqETtANPGALHeU8ZwREIfoaRxG47U7
DIXwHgrLLaL7dvFMTjIZcs/h1tNbcwUtg0dbIVhHVqwYF/yQ404YwXCkCrvEbKT7N86+G+j7H34T
jcGevXWMYWQJWqINpNyHGm57iJmJ7z6iDQbhkRrHfbC3QKQN92rGdtTItw2q65NRQncZ34CjDrx3
A8kWTfnbjipFbmpxoEZHOjiSTm2UUgDmgHymWjJbBg4gGD7NN1l4dlFrJLIosQiUClEkFYCjJwFX
jfejboDu475khkdE4+Gf1c0s7B0TLV7MQYMS3EWrgL61ltxXf36CVpYwOOpfdlko2slR57pGCz55
kjSFRoOZ1PQ6C5QTHqLMJ4zLkGnIhFuKLaGd2rN+924VUb/cZIii4TJDJPChDmJ44YXpyx7RrlTp
dDJ8NCrV3ZSZzsSRuL1LTW64ac7ePnMiHdYb2TyhpxyNMSmHLdSsKFxnkWz5Yav2Mn8EYjLXbYYJ
fcSoRozK+fmGracOXkTFHXHjv2MKTmdEZk9HNbQh4PHYFEL7BAKjetuDaWsh5UrR8itMXL1Cj52X
PvDmGQ3vgeEisxDAjBQuCI9DaEQTMEyzE3nKRI4JDFFcGljdGkYLRbIVG2MxtpQNqV8UaZgSEUyW
JCQXDazgxQoa7reQKz5/SRUH4O45uMEKcPaU/yRmFKwZaxX2MDsdlLnKAljIdhfCbN4VgMKMfYYI
dZtJFCgGuMiKVbLA9Tmx64vPtAoAprUHdS7yG0UyBUr6gE51khzv2MycJh4ak7RuCWi9ncV9FjoU
7Dr4l1zZUk4PTwZMzlp0lbyLYLls7JzIXpoPieJ5jlrFj0QqKwYtB0siv/F3JFOFCQyzYk1w