# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101130005146-47t2izsgx5xbgy23 # target_branch: file:///home/cpowers/work/dev/mysql-5.0-bugteam/ # testament_sha1: cecc936cb2bbdf7c648af6e3d2f5ca8b49b7bec9 # timestamp: 2010-11-29 18:52:02 -0600 # base_revision_id: alexander.nozdrin@oracle.com-20101122132749-\ # tl6m39zsfgvzi2mf # # Begin bundle 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