# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100428095850-xk725qg7cgr045td
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl5291/
# testament_sha1: f696807be4d143010812aa82d6a886a29ac1cf22
# timestamp: 2010-04-28 03:58:55 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@oracle.com-20100428084100-\
#   4zecgwx6zx4p9nia
# 
# Begin bundle
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


