# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20110307090810-whqzm224vwjqflid
# target_branch: file:///export/home/x/mysql-5.5-bug57649/
# testament_sha1: 93ab0c5b8b82f4b900920f13f75e82c238cc8935
# timestamp: 2011-03-07 10:08:13 +0100
# base_revision_id: alexander.barkov@oracle.com-20110304154328-\
#   95d3bhwhda84fyjc
# 
# Begin bundle
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
w6zEM0GukEUq4fP6D/8XckU4UJB9ZYbx


