# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110228163123-oh6y1jbe52aoocrc # target_branch: file:///export/home/x/mysql-5.5-bug11755431/ # testament_sha1: 6b034aaba52022f3dd4b679e52c6f02244fd50ae # timestamp: 2011-02-28 17:31:29 +0100 # base_revision_id: tor.didriksen@oracle.com-20110224070012-\ # qmhcbs7oyzdgiyyy # # Begin bundle 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 OIaA