# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@sun.com-20090929134258-matoc36z5eo2ae1s
# target_branch: file:///home/lsoares/Workspace/bzr/work/backport\
#   /b40611%2Bb44779/mysql-5.1-rep%2B2/
# testament_sha1: d4bdeee042d242c4405eb01838209bbf1f0f55c1
# timestamp: 2009-09-29 14:43:02 +0100
# base_revision_id: luis.soares@sun.com-20090928230420-\
#   9mffmt3uqflnfjjm
# 
# Begin bundle
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



