# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: epotemkin@mysql.com-20091123131251-qky5qu273yws2ep7
# target_branch: file:///work/bzrroot/33546-bug-5.1-bugteam/
# testament_sha1: 4f0c6c8c7dd0a5b31ddf4465a1c2d956103134eb
# timestamp: 2009-11-23 16:12:59 +0300
# base_revision_id: epotemkin@mysql.com-20091106194224-\
#   lj12qcl39yzrctxf
# 
# Begin bundle
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
3s6Q4ev4AwzigAxBxwiz/+LuSKcKEg4jBSRg



