# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20101005102530-26mesvjb7t1gazgu
# target_branch: file:///export/home/x/mysql-5.5-runtime-bug57002/
# testament_sha1: b5eb45b29a6904b0ecb8ffaa8d34eed4447ef84c
# timestamp: 2010-10-05 12:25:33 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@oracle.com-20101004141911-\
#   mp6vfiu3rl9moqz6
# 
# Begin bundle
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
AxDdbIww/8XckU4UJBsaJI8A


