# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101130165848-16vb27c2mumg0x3d # target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # bugfixing/ # testament_sha1: fdee15d88a2ff23708ca3533ed20fe0ff09a3779 # timestamp: 2010-11-30 11:21:46 -0600 # base_revision_id: guilhem@mysql.com-20101130103529-gx10vux0e0n2xfes # # Begin bundle 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