# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: guilhem@mysql.com-20090313141043-73a6mr7hsrqm3djc
# target_branch: file:///home/mysql_src/bzrrepos/mysql-6.0-maria/
# testament_sha1: e8af1d7be280a9fba42b4f5730d679943c258f09
# timestamp: 2009-03-13 15:11:01 +0100
# source_branch: file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/
# base_revision_id: guilhem@mysql.com-20090311172026-tizxk5bv74fzybwh
# 
# Begin bundle
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



