# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: charles.bell@sun.com-20091105193955-2hfr0i247g58j554
# target_branch: file:///Users/cbell/source/bzr/mysql-6.0-bug-44787-\
#   options/
# testament_sha1: 73e440e4aec3541bf9d6e53de6f473749b9f3e4d
# timestamp: 2009-11-05 14:40:00 -0500
# base_revision_id: charles.bell@sun.com-20091105190544-\
#   tq9vk7ro9hcukyyz
# 
# Begin bundle
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
+4dfxdyRThQkIh/ui0A=



