# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20091130175807-\
#   pq2smtfxusuwroq1
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-45292/mysql-5.1-bugteam/
# testament_sha1: b02c48fb465d8411ba7e242e98dc1cb8daeb335d
# timestamp: 2009-11-30 17:58:14 +0000
# base_revision_id: li-bing.song@sun.com-20091122051033-\
#   whfkkgrwim0j3p8r
# 
# Begin bundle
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



