# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jan.wedvik@sun.com-20090902071555-g7x6d9dsvtfb8uq1
# target_branch: file:///export/home2/tmp/jw1159207/mysql/push_spj/
# testament_sha1: 51df99b532172e4c61c06464bbb7713c12648aa8
# timestamp: 2009-09-02 09:16:00 +0200
# base_revision_id: ole.john.aske@sun.com-20090901133616-\
#   rdo1exqn5hrx5ysh
# 
# Begin bundle
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
i7kinChIVV/p/QA=



