# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20110607183502-ysq0uvgxofu5odl1
# target_branch: file:///Users/mz/mysql/ndb-7.1-jtie/
# testament_sha1: 78a3675bd6a09c844cb229016218d9e653c40339
# timestamp: 2011-06-07 11:35:08 -0700
# base_revision_id: craig.russell@oracle.com-20110602214317-\
#   31g7j0m3wcawb98u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWs4544AAfHfgABQcGP//1IS
lBC////wUAPe7diom66dFTgklNAmIzSmwU2SajT09U/VD2qBk09TygyJNMJhEjNDRAAAGgBoJFAQ
TFPQFPSaPKejUYhoaaZBoYAAAADQAAAAAIqFEemNTU09Mpo0A00GIAyARGrNfCCesmy+IF08lSO9
wl8G/BC6NGMQiOkavMXdr7cWhtePgBSVWx5PqeoZk5E3DKTpacBYcPx26D/4yqYksFc/Wp7o9xAw
tgphbEq+QLgJ2xR3D3BGOg6om/Q+u7PtBhNYgu4CReCp3G4nBI2yuaUQvUPVRR8sJjQsJdQrISmu
KiofkggnwJi1SGKvtUIq6RbHyXoKm7zMxFW4xO98Zk1puimgZM+HVRIkRlhk312ddmfsKaLFxUcf
CSfphqwOkgt7NeZEHok4T6gr0SDlVWMRWZaRsGqljzkc08SY3kFRiLiCoqQTiUxwsxIGjpnYS0xR
f2rKwtc4sL1veN6YgoSZcsy4ZWCgMqLtsMR0lFEaHAINaI+YYbDnVRJBQNwEMMzxYLRUQEwXCgth
C00YJ4Naww0vcNOhfwHkOF95AtNbBdEyqYMaH1QKcc60zNBQKg4aSFq1zwxa61O64ZYmTVTbEXKm
ikrslDWTM8fdFaMHszV5uwmzoz2250yj0ZxUXrc1ZArMinVzJBSr5i0H9BZ2E+b18teXG5RpS0Mm
PzkJzZzTi6izfNLUwYdcj8Yhy8Fpq71MSFlMlnXXL41mqlNuZe4fcYrq9KVZrTQWDC87HRGkMQ3Z
XgoxnkTqb+SCU+k8TkLvJuvKiISJEiQF4nsq55a0vHhZ380Xm0FtbQtMOJ9xSNaoPRqIATeGu8mH
Q/a/HjZ57SCigJzqLnZl3aKau6tqK7pHOav3gMln+20TKwXK+qRLF+EPZiBsBTBBR7DxNf0bbbjC
DeeWzyUAOWJvF/PjaXM528xQsU6mRmLAXkXhJQBVvL7SqnumiDgblYnHgwGIUf22l1QVhuqPGiL0
91Av0XK9Y12YFVwfG9HiDY7QphBljsSGOF0SyjuFqphHNN6nQZ+XwW124xlhhK2UwdGkyCT21kFS
XAUd1fUWkUmmu/hNdwujvE14KQNOMJ3SMwmXN7lqoL7bGZQDrVI+LyFDvQUSWaykinC8rysWOUcJ
pWgUOxNQFXCbV7E97t2A7FVcuYrdKvFAVqNoo3SFo5DUobyLd/vqWuiizQ1zIAUhWEYOKNw5Pt9h
lUBPoaaHSOFqco5Qk9Tj2DgaHftHb0mcZNrs458yzK/8XckU4UJBrOOeOA==