# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20100812121331-rnoqhka19ektqoob # target_branch: file:///home/rl136806/mysql/repo/mysql-work5/ # testament_sha1: 740cdce54674e2e2a34388a99c38d282a23ee8bf # timestamp: 2010-08-12 14:15:18 +0200 # base_revision_id: guilhem.bichot@oracle.com-20100812114810-\ # h67bxlu20az1bq25 # # Begin bundle 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 EgMLcebg