# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100716144304-2s9nd5f3fnmm4906
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   cleanup/
# testament_sha1: ef93f9c6acb2e7ac5065d8c4e982eb5bbfa91d62
# timestamp: 2010-07-16 08:43:07 -0600
# base_revision_id: marc.alff@oracle.com-20100716142819-\
#   174zxrl11k9i94k8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSDLN4YAAbDfgBAwXGf/935i
mAS////wUAPiyd3E5PW8M4GSIyRmgjRptJpkU9pqj1GJ6Jp6ZT0I9QSkjImyTBpPQp5IMhoaaAAA
AZKeRoUT9KeUyNqaA0aAAAAAEkVPKMCJ5TT1Mm1PUZGgGgAAHqBKSZFH4qfqepkntRonqNqekekG
gDQNAFrWMeXL/TbGhPb+vFb31m3TBlAegMCNSKBEVFYmc3/vt8S1+gP81GFwYJ0Vuhgz3qhgnU1M
0Kc5fOV9+p1vx7dEqv009GzdtsevXCjWqHZBZbm3SV2JY4qQjbp4bQMfvsiplkEhcAbseQRZlS/H
DiIsMc+mMkynZUPEKUqzxIhmjgtzFjMYsZy6OCuIFappVYaRwxBEmJEApz3C9Q1AcCNgNYwI9mEB
KpczD2UqQNDEHpQZbxlyXUVgHe5JRXtkqxKh6B8u+LpK5ixaA8kZ1pC/UuhGFblTvKXwiGJNKpMw
hOq8uVav7JczEhMXaqrGzBMGE4681RFSJbRRPEUDNQU0vY2ctgW/stREUmGAncW4yrqMYsAo1DeD
RALBatbKTQY4cwt5CbI43JEo22eDHMQve/XkBYMwlsoP1RcigjCwZBexW6hpmeEdUWAhgpRFEHc6
7DNUOkzI50xPIzlR9wCsoTC41OAUFWpbvnCdooKjOFtoiY6nSCqwF6zvaxppGIFqh3Uo6REQHinE
Sn66MiYzl/ptrBEXTKMkaFCu2Dn1Z1+YXNVF8qbZQ5ZD/JYhzrNSYP72eO7EkONYtvzUMAcPm0Yg
jDQo6VNyO/trWiFaDWRjlaJ7nvdDRrFUmTTdjrE0blCGk2bGlfPn2wOyEVqlAlUYYIg90ootVLJZ
wXOWgLRVJGjSxgjAyCi/WHDZl5+NLxMhJ5b40p8jp4bpqRgqSSQC7gF6ROIN0HKIS+eGdK+Ruqo3
ozqodxOJSh6TV1WLmUvY2wIBjYi9FZSazPnEgUAi2JMWIheQJ/qtO/DU27EJUwwRFYp4SELcLzNz
4nAWAVCRz5xDmISm5QEI4m2uEK0bcEVLkMJjeAWUEkCmAVdG7TaucKErCfhpY/ItS9m2LLpUVqWY
MOySXSK1aE1IQcIGuTQDCGTR8qREGex+KOEKYJhGUTXGdeZ4jPbWpMGMl2xTRiTXR0EPtygmJdpl
CieINqE4Rod2ewkNdwsjl8UYmUzqfFc++1gKIdGBX13iJAlUo4WFeQ3eBWZmYrGhmFou4OZFPlQD
EcTHFqrmAFQn1NYph194QT6sJHq1RE09KhlxqXeYzEH2VxV5WojApQP5C7kg1AqqX+qFKJPeBkCb
fTZhaqsB2lTwuVZKqjKvStZkFYp7DXSvM7gF0NDU8JFcWsRch5K0iG2a2Dh00cpyzzoyRmCodG7h
xzVXl6NCAQ3rBY5oHULIvG0mxP8XckU4UJAgyzeG