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



