# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20100803074015-1x1d8jgmnrta2x8a # target_branch: file:///home/rl136806/mysql/repo/mysql-work2/ # testament_sha1: a6e813aff4ace183062507c150195b098bdedef0 # timestamp: 2010-08-03 09:42:28 +0200 # base_revision_id: roy.lyseng@oracle.com-20100730073220-\ # 4ftoia6pm7120ehc # # Begin bundle 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