# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090421131654-uf1e8w1bhyhbxxqa
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b38468\
#   /6.0-rpl/
# testament_sha1: c73c0b7bcfff39923e3ba1cff16494a4f3901465
# timestamp: 2009-04-21 21:17:21 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b25192\
#   /6.0-rpl/
# base_revision_id: zhenxing.he@sun.com-20090421094813-\
#   2pwt8t98nnky0f56
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcHtV4sAAZJfgEAQUXv//1JA
QBq////wUAO214u2qHet1tm4SUTU1Gn6U8mT0mEMhHpqNAANDQNFTymjYmp6T1PUaaAAABoA0BJC
CammVPak9T9U08mmUAbRBgEYgklTQAaMgNAepkAAAA0ElJoMgBNpGjUaZqGo2iekaZDR6jENfPMD
o/aRCAqkYMmHPKpCSATJNImolDSSN+EL8B5xvZmXd/A8pV3uO2TkRH78ruv1lbvwO1pt66nbW9mF
EuN7bLqfiDr42abEm5KIhHHMHDeNLOkqjEblSpa54TSFo4EoloW1IpvSMTqRrnzbra6pZRxh5Ny7
zg4iCImYWtdeIvTREgpSUi+CkeOMzjYuztuFcMmrB+YxbWCt4VXTWUK4XRRayV4ocZvMjbQpj8+l
p1FcfOgmLAhmy6xIzIhE5dJA10EYag7p08dInmw54E8jlL3JZjnsg2YkE8otAqe1iWqaRrMNCvWw
PCxSbbAcKKSUHRAnBBkwVhuEcdoJES4cFE8zErRYGIWlK7CgxyJtbDA9conpRl5/n16sGIc8xxkL
iS03VXQtosVyGYipXDOT3jm4ZEy5tCsZVOedSyNQTaC0JJVwKDy6G9gu1h8lcCYePaQDyYZe5x/M
UcpDwJaWGPFpY/ShpMLiyYGlkxK9vsKQcxsOe8iMPAqKq6iAelpY2u0YT0Ac/Y8PVOOS7zx4BeEO
6Aqt0tos0fZXhCorJzmcpNnp8D2k6Rmap6uR9BwwoUaaNG2E4r6iXUe+X71nNUnfFaKvvcdDakbY
aRUkgSbioYzf5LdM3qqYkOBeJTK6tscAyHFcHqNwHMotFEFeLEkNw4gq4HOtZWUHvftWjU1Xec46
cCl0tPE8RL3AWHR4mYGW0UiRX/QpD8GUVoNuYnq/hOOs6LQ2OLeIP+gT+650dQFoG+SLsfTkwxMy
bAGZlFqatRiGjOHION1OlBWkZpjif22UmrSab5D8PrWMkhktp1XTCTITtTHNd63ZBRhMmBPOfuIJ
GDCYDjKjiJy2xLrbmFuuuwZllsWEo8NpFN2zWVj3jJHbjyWy0WUqg9ZwnGMDXEbWC4y5sGzsUTVq
2UbIwD4UKMe8dfqvI84GTOaixsnm5BuAZroevUvY9VMeEOqRFZfZL4KlaK9spv3DmcLsia3eNHjg
elGxYxGhH057hVPUgJuc6jKvPACf3I8SAmmDqJpJxg5io7yYFgVCmWoWWtl6a2k4CrNNmf7HqJqw
QkUro2JCYmpWX/4u5IpwoSGD2q8W