# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110404134951-\ # vatvwi09qhqxf8gt # target_branch: file:///export/home/didrik/repo/trunk/ # testament_sha1: adae35caa86d314c479f8e6f4c8d6b7a2ed42dc3 # timestamp: 2011-04-04 15:49:55 +0200 # source_branch: file:///export/home/didrik/repo/5.5/ # base_revision_id: alfranio.correia@oracle.com-20110404100613-\ # nk1mbe89kyiy45og # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRfqqqQAAW1/gAAQBABYd//3 VoiWAL////BQA5T3dJdxdh3l3eGSIaGqfqm1P0JPUNP0RqeUPUZMgeo00BokyaTwTTKNT9IQ9TQ0 YgANDEGSDUwKamnoZRjUaMgAAAAZIk9T0h6QGmnqGg0A0AAABJQjSegqewCaZCm9UfojTU9RoADS 7B5++veFTmU74tACqLqVRC7QKczamS2LMzHx6FFNjkDRqwjjj1TZ7roK4O9v3h91e7VRYLWA/nqt d206MfAKQHbdCfBWxGjMEWOF9Dq/gS0GLqtBZSppIxNhOZXDxe2dsk7XiaxhzGK9sSYId7LhoixB ENjW+1xqJ4NVz9xVjq1BmCr8e58jtiCHKNAnVoI62u3hSZXK23SawBLkUBvdJgWgXW7TGXR9yrD9 wfeY2E58No3GCFgaGymFR6DBMLWAT0pTqq54CV4MzgbAjbqRGFYkCsCwgRY7C3LUN1mggIa7pAvd vJdqGQXPGYfgdGEkCAzJ8WaYVX1pKmgm5CtHFAgUkySK82eShcFviTKCShb/CDRzoRE2tLKNQ1OK u61BY2C0SJCWusiC5NrmMKstgvW24AIaC3ETMAcJwDaGTAxIWI8WsDmFFRwsAViMbkOzTU1KhpSG WUdJkJnWEQJh880XH6H4IjJs4jvL5p2B9flEMMWBbfgarPTt5pE5uocGJ0VqlqqeHjCZDesq9QMN KK7D0Xl1gr+Zuu8sfcERAe9x0Zzd0Kj1yWeRk1iQ7kdkiDFp4Pmt7WaPtK/M4U0rYrxrlnhKUDn1 73yaxWTeHOIFu1cK0JCkm3yoOkaTbdDXKmKp5gFYsnYKd2ONWQ/OeQTcURGLjlvQHgBY7yMs7szK 7xg/iyAPTbSF1tJViJsR4qc/mvwuZgxacUzMi7bz2nJDLDuncxW9eHvWhUOBptoFD6WLQXEgHIsf Sv9Wk6Ro8DJON0eoTRz1f3KuLao0YhotmCiztMNiYy4MuAHdYqQIBBoVvlSGDw29eS7kJJ0izjkt VNoR0DUt8bFG3R34iWeACowlJ2iSk772CDihujkkQqFCq6o2SvcdTgDEwidgnhyE/SQgCi0wrKV8 0mAuuIhWJlswtXHRt6ZBne+YHaC6BABAUJOuM3wyJ5aRFtcJbrwBQtvhgudSqO2MKtsffcAK33sF LMUQsicmz6PW9YO02EOsRcgXIRyCU6Qo1QzDBbaNEREGjY4B4Oe1U+hKKyfOSG+kwF8ydMLwkjFs LJzj4CdNpfS9e4GzuSAoNBYWH0puNHRewTf4u5IpwoSAv1VVIA==