# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110308084157-68fza9cbh78002fr # target_branch: file:///export/home/x/mysql-5.5-bug11755431/ # testament_sha1: 3162beb30bddd7ccdb23601330765bb5084f1e7b # timestamp: 2011-03-08 09:42:05 +0100 # base_revision_id: jon.hauglid@oracle.com-20110307133049-\ # uciqe0d0vxf2j2ps # # Begin bundle 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 YAZPh86j/4u5IpwoSF2MC0UA