# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: matthias.leich@sun.com-20090515101556-10dt6d2piph9pxww
# target_branch: file:///work2/5.1/mysql-5.1-bugteam-42308/
# testament_sha1: 60f6bffb3ea5c2d34c7c32b377e201f8824f2f02
# timestamp: 2009-05-15 12:16:07 +0200
# base_revision_id: bernt.johnsen@sun.com-20090506115909-\
#   b0ryf7kxgwe4kpiu
# 
# Begin bundle
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
BmNReOGSyF5WRGAfM/8XckU4UJAv2oIc



