# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090707024417-efaow72lsf1f4rm8
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b45672\
#   /azalea-bugfixing/
# testament_sha1: 3d2c11649d89521537e1af9bc7786518042ef0a1
# timestamp: 2009-07-07 10:44:40 +0800
# base_revision_id: jon.hauglid@sun.com-20090706071401-\
#   fmmqttomxw0v0gjd
# 
# Begin bundle
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



