# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: roy.lyseng@oracle.com-20110627064551-dhzsrv4q0tp1wfim
# target_branch: file:///home/rl136806/mysql/repo/mysql-work3/
# testament_sha1: 5185c4648093bb682285d5e1178c935cc622c90b
# timestamp: 2011-06-27 08:46:25 +0200
# base_revision_id: guilhem.bichot@oracle.com-20110624142006-\
#   ai9nocndvladfgj3
# 
# Begin bundle
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
VHzhre9xb1JXro40LXd8yC2ti3E0ntaIg1LdIz4c1zz7a+80SuxdTMnvzMpw8rb11WS+aThzFVNV
OZlkmSZJnk9fq1qcng9PMkdONrv59CfExtkb2jb9j1E6UvJ5fTPnk6d3X4qO4noe+pimn6vL2VXU
85XaWrvk7fIF4224t2gzCZlI+R3UfLRzbYfBRnBRznDCXvNJ23u2DBkkNNVMa4Wz5BDvgQ4ySYho
dxhllvOD5GUPTIGYnehC0XqbEXoMxv2mnJMDEegp5yFm6h2pBQi7x1JZym+2LsxOSnS6ye6VXXF7
ubepzsYyqHp6ueuUCdN8jmKDgSHBVVrac0Id0wwuVVGxOL8IXwHodhM0kzNOjRDWwmU5yVbtchvx
CeVAmIXgxA161VVVVVVVVVVVVVVVVVVVVVVXWFUtpckkwrabwm7k30QMuTW4EhsxxwoIYVYIWYQt
bWTiW68ss320ZE6rzQ4pUkDvZ608Wjctd2/1G8sNxoT6uzhKO2IZUYTLCZVJiFlRgna38Zwtymal
irsKc0aLKPwR6qOYevOMl/7ErlEmVvTja05VjIl+Je3UpdITipeke51F4E3E4txTTxu7CYy1EadW
muQRCHqmjCSGvWY5Cds16NnKaCmUCsWFjk5teo/U/JsXPvxZjSVpeYLxUbW0205u7bskVuE/i/Dj
bSlGPSQ7pD6vaQ+8RqxdG5rmRT2vpadrt6/66MiXxxL98nxfM7KvhnyNBHlEedZCtFMFbRdup7Lb
5C0lbe1NcrJ7uGrxebukO4RV6OoTtdXk3Ek8Ukrv9TPwZbsjtU06rLMvmkxL0ud+BwDtlLl7scpC
zPkI7V2/9nJaTtYP7wl6QnVSSLKIlvOolkhyau6QukPc+C3k83tY1qn10cnN72NqV21koxZR41GS
Vu8W7c+HHr121byrN3lCayo1tWE4SGa9bS0owR/W7SeJRtR9nPEHrCO1nukKbBHb6KeoaPP3yP0c
FZJJq67/6XyCech8Gryfw/wUo//i7kinChIANhJAYA==


