# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20090713133323-oecnwmrrk4xmcl06
# target_branch: file:///home/msvensson/mysql/tmp/oheUmOdmQm/7.0/
# testament_sha1: 7c6a51420a3a4674969952733c46acc270a20936
# timestamp: 2009-07-13 15:33:35 +0200
# source_branch: file:///home/msvensson/mysql/7.0/
# base_revision_id: magnus.blaudd@sun.com-20090713105128-\
#   2hj4hjyj6l5oq5rz
# 
# Begin bundle
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



