# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100812102122-ml52d2ffah1u9jn5
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: fa538587b0a1e5566b3fbb862a649daa1589aac9
# timestamp: 2010-08-12 04:21:54 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: jonathan.perkin@oracle.com-20100810140727-\
#   0g0ee595dxxqbkcz
# 
# Begin bundle
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


