# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@oracle.com-20110327181632-zcv44cu2cawtepw5
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/FIXES\
#   /bug11748510_36524_less_drama/
# testament_sha1: 1b6a727cf0c9b480ac878164489bdd872ecf195b
# timestamp: 2011-03-27 21:16:37 +0300
# base_revision_id: magne.mahre@oracle.com-20110322153114-\
#   y6p1m9y730lssgf7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd3pfxgAByd/gFUQEAB/9///
/+//qr////5gEEdvd3rfd9vW93ZMq7sabaFoO3uOXKo+2XWr73j1rC3ta203OuuostN3u4CSRNAA
VPJ6R6aJtUeEKfqNT1AZNGI2kyNNDEAyDJAEYgTSniE9NJiPJBoADQAGgAAA1MTU01TyjTZIDQaa
aaNABgjIAGEDIGQCREQIaSejRPSnptDKYhhTTCaGgMgDQABoNpImhTyMhoRkyTSD1Bp6j1MRkAwI
AA0NNMJIgJoJoJmo00mSnsjRT8SmnigAek9IAAB5JepF2sJZGvRi9Du1+TYx7u2XM03v0v/yJ+dj
4wfM4axhx7dx7qN7/07z24ShXF/Nm+NYbfAaJz4ZrptBXyFtdb2rMWt24vNaVtdd6hTfylingibP
F1a9e5GTjzBDORqGRnkSVqAhX0VkcQKYSOdLjbQMuqRuDNtS0etupBFUhN0BC/y3rG6Pw5CH/bIv
eXO1V6KWiFle4QL9mCLUj0MS1sHuxdLJ8YnVUcCqTt9YXCBiL7I+WdZns208q3o2o7qG22222CNO
TIm1+6Dj58dpQzYUu6dtFgzkiaaBrwBRSIgrTEZMWkqAPJSCo5Cc5zXksEaOfWt8VL7ILp799lbB
4NW368e845+A4OLQbwauZSSRsk4NdmJjeLxnQSbSf39yqM9hQYmgso2UT09eXJy2OeQfH/0WnTnT
iRrDgUgrS1RneEcWnwJa+g4QMNdLzHumHfk/JlKHjM0zS0lyIBCSylHA0ASE0vtpgMQooMw5kkoz
3LCOtS4yvpntvrclzeBZdrwgXvox4eg28GXNzuy7WA0OTyuGxG3CFjNUqRIajGUoqs5R3EJGFpXo
ljWNm2YTui7UmpcLh37NVb8cc2XINFSKS3nxhZ3957DxgxgxhtjJ6vC7YIf37c55Dh0w0pnbTAdp
m4s97btrlvaft9gzPFr5OzKWFKVndXMQRzIWQYlaUGMouk56hUwLd7KVgxvOPDv3RdkkURkP75/e
LtsiIndlEvy9SCTyOAZg3GkR51LFvpqF1DNzVq7xOrUnBYAqxQn0sLaPFrdu1j/Xw/X5m+A7nC9/
di/vEGeFa9Y0iNkFBj7GFai9mZeu7gwgq0dfG4iPonNis3K8T12CRl31HqnW/iOHeJV6/SZq4p1p
Uxbx5+tBxYUFcfWpkymEtNFLcb+Fh5P4zrbGk+6YMDNrcSPUb0k4GjDUTrxzTUWwiwzDDEUdOPYi
eVEa6va+C49KJBNjj29GWZC0sLmhahhztENWqsKhKaiJXYtCqSgosNZeqWJlU0ghWklrpEMVCIYq
iaEUtKQJihBRKK4kn5y4rGOCippSUY0vUbilSpyuMTZ6LL6wZzVgqrKqMSlt6AeN0dI7DJgoeUaM
K3sKCcQUOO823QkppAyZYZLp9y6si1+B5WQ4oOVc8m9YxVaoXtDztkxUgD03pyBC9+rFg3ATips3
Y9ket81YUSa6IE1wlsjIEFvUye1EOcM4rzOjk2FBU6tpNJVqYwXHnxEZbb83fM6wRigN9dmIgGjY
0fhiKJQ+KyUSDdl0xua5abONq8d6qWbBxxxIcsJcCrF9zDS7q5JXcdK0A4BAt71cMJfaowW6eE6T
Udh1tdQ4RpljYMmmrSHxbpOYMllBSYUdMzY1E0YFViJVeKAnCxeVJq8v1HG6dn8v+4rWVJO3RbaG
RFfbwzO51y9HzWi7l3JoqS0W/DZlmEZSizuudQjHj0sCN0NsZ8YWkUYq4CUshlMTW6JmKYZzhu30
hULQ+62V6MKulrKbmIMIiwX6qZTqEgTMK/x0GfgHHTJHbWEdUHi2hOlRRZF81QWstxCkWGW0csNq
btNhwXWUGiCmls5MB1FgUctYRTAMS6sXo2OQvUy0Vi4cQxWMXjYbemV8V5zm+gzQSSlqkxTLDByF
9TmAmhywvucN2K3CQmdVYQOLQ4TQTyLJesxFgkaxPafwHnQOc8cwLjhQ33ItVbLKFotLVXaAvAPU
FglHFszfkqGwohm3XECxHwUc8DvV5mMUqZ8OBlrRPTtjffTIlOVkVBYQy7i6kxzZLq6lsWdZKPVf
nYr04QGiEo9FwSYY2DBEuZxze0HctDbduc5iprqWOrFrsb8YXVjN2kpmQcSpBlRehlExMDXVSrVY
MWzrHGGg5ecGO13LHP5+C3LPPF118z9OWzbjOUxoInF3qc7KAoCeU4pQQ7W77jbKQpPSTlb5AXwU
34/f2Zc7mP1PymR+DeHvurraxRz/YyYlIMw9O1i0ngW26eItf4PzXEeJwErm09ZueHTDGxyikSiB
F+UOjyI5vGgqOWMR7QNS6aVWkoCfnv+HwE3p8ZwnkGZMDMN3kBif4AIDEYxMGMJzxXU/agbk7gro
QErPIdcgmGgYasKqdGeAeGKJMfMISFMVjVD/wXfQYsMbAwNbqouYlvLyA6NGBYnyY1iwCRkfQcsT
yNpeb8qlSoF8ZkEGw2ivO2GFwsR8yxvKraWE9WaMMNArCpiMWKvgsfZ2+yhq7sKd59obH1nYI6Wu
R/CS1AUkYUR0QiEPyEAfB6fouQUtuGxiGjD2XCJob62aeB8vx1CdFNDDkEl9Syhmo6AfSUVgon+Y
8hV9p9S8UDyjjWW+cq8x6Ovw6jCQKXX6icSM+Akyzmh17IDXqNF5jMgnA5BWefGI1hYo1dH5bAID
LkbuBvhhUOtFeBIeMFmvznQJkW+k0IwU2zms5BkLpCq0LbxFwUgoY92DxORUnaAe3Mq9BrbJEqs2
/OBYyuwvsAqgyBXCT4fD7PPqOZ6KsuGo7TGA5PXdJiQgcR9h+CRCNRZxRjUD1gjewVSKrV17XTjb
lgfMJJvvzCLmoLi1ZyYuOF5QjuaTfcd5lyvnErV6Ck9ReyTMdOG5TWRXnOWumJ75SV4mdSLi+WI2
Q0lSFBJQgVQU0YALduJyTNLVKtcnHBefoEt6qT9glBz7lTOB2WdKLuDMQA4ocDyzRrtykuorTjEa
pJilQahLVDuFhIkXmEeK4YGI0J1zKGe+jXKMLBHhrEUmFOY5s/4sCmMFj6muuzFKIB30xoUAMJ0i
s6EoY8ufSHrPJsG4SSOEZaiIt27oKcmh0TLz1sqarazexQyCuaSJNjQiQaz+vDAvxuo9EMJDCIJg
dFqC7DrGNcvQ8cuj0wy0+qbIlMCBoIEhvIFy3ovRyKODGZk6e4RgA8mBHfQNN4BSDm4uz3LwKhov
TrHu9BZpZd58UkboZOJB5UGc+Q1b3xzNHXjrbVkqqBtATtoYABSDQLJVJr+ymxAPRJPDkNe40LBL
74HDO3lbqueqKiUmhwQECaCiDpkc06tqrXCwUy0UVG/hRFvSXeFe2Q62kSIYztmQrdfr3QgzzK30
xFo40IK6be574wKtVFYVS0wClIIJglXndkBkL5LUiPNouw2LE91pgxg2hj2gHgNa7/ItpUmcy6jx
9JwUBzwLHDcbTHx7Jnw8fNq4ewyA17jc+gsS9edGTpQ0aBVTNa2dSyKSi0jLZ5iQUsobNtG0uLFx
YdhOERBA0nMrzGNYkuyZ0j9xIaouBdCm7Bdqy4Lq6Djb7JYRKwTKOcQWQ3mqbjIQetgaPxord5Wi
fimMddDDVxW5XLTsXJArorpHAHJLvyUSyN1KcxHTu+95gDXsGwjRILqe3eA4rckI9fNQDjTkweqU
El0iiX6OzM0QLTYjlsx2NiNqa4bYxsaSTK1Tx7/etR2rUbyAT9O+UeqeBiCzpjEwU4Y2ge8npO4A
4aqcwX9ziyS+yFwL1e9gbCoVasvM5Rdw5ujZgdbMASu4ECuUzTGYxGgMQIzwYKVQ2ysxvQwG5yeH
ReBHgrYa2OxphF6wabIBQma4O315UhNgjKZa80WC1bokQksqIlyYFgLbHdSayad9K8swBP2EUNqR
wAK6ulPgVi5VrherWF2O4ppnghJdh1EHWPIq3Gg0GlraECpXFj0Om0tEjUpVQJ49+zaslErla9TF
M4p3gsUzVymYvXZcZiVde4g3Ig9UZWDmEZSJHNZkdvbAVAMReKpyKM+mxQqmEyRCSZJeWBKQi2LQ
nExE6R5wT0BEwHFMFtFoPYVB0YK4tKFxWsms5OawPCZplC8EoteLbTaZnTSUNpsY2Ey1WEyjofBG
9K3MuWEzOnU4aFJwSVjiTOVI3mgIXMXYiOdhUJEqCRlTN1XpExgE/LXWa9zXakzLR0syznewYank
wIY+AkVA7gUAsSICUU0zbv+t/GpyXFGKvKHP5dtEbsaZwRgrNi1LuqWc56Lr9z0MCrorEy2zePit
2ey9AruFnBOhPj27cFs1VXeU1kCwliuK2K2qXsZc4JYmUlRCTMHGlpGDXzTOBvgmqNDa4poDaRu7
lp1lEgoC4LRUKruTEWGLcFgyjAOfEAqrhNpUKeXYTupPb09aLaVbSTOWfDIs2Ra04TOwPTc7IDiR
aS15/O7eEluKiJh4q8L8TQFjjaCB5eLYvQ1EOyJVKS2OjwDOYm2QEScD3BgxyMC8iQlp53CJbmIX
D7baVgeffmXaPIyybIhlbndSi8pFKRwtT4FyqRFDbkWoLYwRASig5J+QbLhmnTX54F3EVDGCmjnb
RH24l82BbY6CgtC2MV6SlcMYxQPkZGzUoaFK2wwN4t7xiIiIiIiIuOpQdtWpfwprahbOwg48WoBa
G01Goio3K5YEiSxAmPDGAuMpV5QVqLzr7vtsallCW/uPlZAVcaIR3qyULePZfhXfrbgN5KKqnI4N
0EfhV2HoJXl5UXgIcjCLPNMgxBPfKjUIrCgYJbEdhX2CTyVMKdYdRYexERDBUQ0Ors/sfF/XJW1Q
JHsNHBnUXa1rmlZToXHVQLJc8WyhjYGiDLo0FQqWVCZD0JywKzc0BgTYiCDLlbY6UugTMUR4Qca4
2x3yoEwOB2GEuhAAIMAKi1oicbNJ9khZ5GM4yC1SacjBY9kGLxvL0E0RvU3EvJPctpnWtMWDhiBb
Cg1gOu4lyajMTtrSTPbK8D3fhKjtfVZa2udA/i61ktC6WQPdzbiS3jo1Y1FeUtRyoLYyeC6R6pmg
3z7Q0HcOArmtLdsFDSd0zzFs41k79KUy6fMWZ53ILQWvIyOQr7oz//9VFHrF3JFOFCQ3el/GAA==


