# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090928125554-\
#   vwufh0s8gwp0owkc
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-47287/mysql-5.1-bugteam/
# testament_sha1: b18845ae768347821d83d62f2043d5adc03c2854
# timestamp: 2009-09-28 13:56:00 +0100
# base_revision_id: li-bing.song@sun.com-20090928062419-\
#   v40rklb7g178tjza
# 
# Begin bundle
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
SyrvZWPdQxxv+LuSKcKEgIVB4UA=


