# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.hansson@oracle.com-20110414090214-\ # z5sdw8yukrxbonpc # target_branch: file:///data0/martin/bzrroot/bug11758558/mysql-trunk/ # testament_sha1: 5062b8dedebdd45260329b3cfcac95884ce1798f # timestamp: 2011-04-14 11:02:49 +0200 # source_branch: file:///data0/martin/bzrroot/bug11758558/mysql-5.5/ # base_revision_id: anitha.gopi@oracle.com-20110414053357-\ # f2h4i4w9zusvzoam # # Begin bundle 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