# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@sun.com-20091117101207-y3779rzw50cm2emc
# target_branch: file:///export/home/didrik/mysqldev-6.0-codebase/6.0-\
#   codebase-bf-valgrind/
# testament_sha1: d033439bf8942cb2b5d691d0a54989dba9011c22
# timestamp: 2009-11-17 11:12:11 +0100
# source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\
#   next-mr-bugfixing/
# base_revision_id: holyfoot@mysql.com-20091115192309-hw6blgq4f8746nig
# 
# Begin bundle
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
zOsHteUeX6CT7F3JFOFCQqMj3iw=



