# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20110302170619-bdrhdmu1gm68m1r4
# target_branch: file:///export/home/x/mysql-5.5-bug11755431/
# testament_sha1: 0a11ec2fd32cd00177b9748e88e472e39fc59e7a
# timestamp: 2011-03-02 18:08:50 +0100
# base_revision_id: vinay.fisrekar@sun.com-20110301160300-\
#   tv3ricuvr263335p
# 
# Begin bundle
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


