# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101118195642-7p154b6frn4yk5eo # target_branch: file:///home/cpowers/work/dev/mysql-5.5-bugteam/ # testament_sha1: 8c49aa2cd7f9045d3265efa66e310b4d7255ff29 # timestamp: 2010-11-18 13:56:48 -0600 # base_revision_id: chris.powers@oracle.com-20101118002258-\ # a0nool487uklvgnv # # Begin bundle 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