# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20110309134505-7j2m14bxx7r8qk22
# target_branch: file:///export/home/x/mysql-5.5-bug11815600/
# testament_sha1: 5c2982033c4f7db257c2bb08595bb0db57f6fbde
# timestamp: 2011-03-09 14:45:08 +0100
# base_revision_id: marc.alff@oracle.com-20110308124200-\
#   94sl2jmraho7yxzp
# 
# Begin bundle
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
GtuK


