# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: roy.lyseng@sun.com-20090827073327-rv5d4lp4ueh9zveg
# target_branch: file:///home/rl136806/mysql/repo/mysql-reeng/
# testament_sha1: c4de7a565ef6a5472a54f6ced6c426a5fc1dee2a
# timestamp: 2009-08-27 09:37:13 +0200
# base_revision_id: jon.hauglid@sun.com-20090826115923-\
#   d6516e54fmyxq3nn
# 
# Begin bundle
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


