# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20100611021227-kdk6lp25gosng78v # target_branch: file:///Users/sunny/innodb/bzr-new/5.6/ # testament_sha1: 5e125e1b0fde0ac4b927f7dbc4e6311e47d13411 # timestamp: 2010-06-11 12:13:40 +1000 # base_revision_id: sunny.bains@oracle.com-20100611013923-\ # 3ngdv6y88a81fyt0 # # Begin bundle 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 h/xdyRThQkOcoTV4