# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: holyfoot@mysql.com-20091103030647-r0rysdgkdnygbf1m
# target_branch: file:///home/hf/work/mysql_common/41371/
# testament_sha1: d90b6a1b0c1a26b41ab2abeca41dc67564506ac6
# timestamp: 2009-11-03 07:10:24 +0400
# base_revision_id: alik@sun.com-20091031083515-bcqnle0mqi14e52j
# 
# Begin bundle
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



