# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20100823144915-al370zim8mduenx6
# target_branch: file:///export/home/x/mysql-5.5-bugfixing-bug54332/
# testament_sha1: a0422a32ae590e04a6931b701a8c9f147e5e07c9
# timestamp: 2010-08-23 16:49:19 +0200
# source_branch: file:///export/home/x/mysql-5.5-runtime/
# base_revision_id: chris.powers@oracle.com-20100823132959-\
#   kz9nw6264sxpm6q4
# 
# Begin bundle
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


