# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cpowers@tma-1-20110212002215-lne86pesxclo411j
# target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\
#   wl4896/
# testament_sha1: 50ad9c35c1d1728357ca45d1aa6201576f130ad2
# timestamp: 2011-02-11 18:23:36 -0600
# base_revision_id: cpowers@tma-1-20110208230139-aunxabwh1degvw6p
# 
# Begin bundle
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
PDzzzwUgu5IpwoSDHlzdgA==


