# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100307171024-wef4tek2qxkm3xmb
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   45194/
# testament_sha1: 3aa3bb062d4a01bb56be067ddb9419211c535309
# timestamp: 2010-03-07 10:11:35 -0700
# base_revision_id: bjorn.munch@sun.com-20100306192204-\
#   rkpjnk79lduy3y0s
# 
# Begin bundle
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
zG4MpZ/xdyRThQkKnEhaAA==


