# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110210090017-\ # q830uurrqn6npihc # target_branch: file:///export/home/didrik/repo/trunk/ # testament_sha1: 918e78b4c8cfb3336ba210d5794de3dcf77f5f37 # timestamp: 2011-02-10 10:00:20 +0100 # source_branch: file:///export/home/didrik/repo/5.5/ # base_revision_id: alexander.barkov@oracle.com-20110210084705-\ # 14u68nklbiuw4kb9 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ+XuPMAAWJfgEAQUGf/939G lAC////wUAN3Xk8rx3WXet70JKTSniBlMwTFNNoTTYptNIANAEoQSbSZonqZNT1EzQAIGjEaMAyS Y01IxTynqek/UnqPUDQaBoAA0GRUNAHpqANPUB6gAAAD1AklDEanqMpsp6m0IPUA0ABoALSm41eP aTjelGi6QGT2hjk7VVOTlFXx/Kej41q0lcqxePvriO0F5hk1DdQYaTFVsbyqEa7zbaVjQHkEdwst MjDog/QTFr3bUxRBQNyT2W1x4a4iNtZeQRUC4vURMPEyCJlUxOr2Auepwg5N6Pn/SMkpC26eySCr ZFI+TDFyCQ0XufB1zmlWp5H1TsVIrclfVPqiWXfQ10dybcZglNDBAjdwFRpO9QgzzY9rCoSOc64m ilZxaPL7sMtaEuiFl16YM2nouwtkQiivIKMQINeKX8JiWlARK06b4DgxOphjjZoeNYaTZG+tb/0y lI225CTbduQOMyULozzCF4qoNCoJjaDhpoLkvWMnQbfIcj+F1YklTAgbDOIqTqxS0yLSxbesm81W MFES1qJZ0jc4K4oqPEgIqi1dgs6qahcME59lz5lCfbMIAY56QZejz3s4z46b3c+VwMOTpG4E1O5+ YsuSGvY2hP0YQhyiievC2fMjuWNczjnM7LlgtpuneMC5Sxc2U1FYMWg1HgXlpeUSsMMV8hrrnfcY kR8bfepIdpKJJt8MuetXj1NuY1EFeQNEXUhbUWJcZEDU23HPzMCr348fv1vll4Rfy3btM5K187Qn v3sPXOrPpmsnRhBeD+sRONVS0HimVyLrXasL6BoBnzDBQqK7fJ85pMpgYEj4x4aWG4oRrbUZsgyY MgoNunKpSrSRWfq+5UmwwNOwUAF066iR3WENlEbX5QgrD82GylPNtjMWpdpQwspBquXABrCQSmC9 UEkhijoyA8a6WHtCcRvjRWU8bTqGCveN9s61qiGoGDnvJdNngIBQHQXlOuoFiIkKG+wRkGUd6Cu+ YIOJgSEAnl6lshdcdYtSIheFiC2iEpApWDslPAuJQzRxJ5HgtxWCOWogRNKtqdZlFYKqEGWEwWUX AV52MkAaBmbv4dcQpClFw/SW7lo9zx/e2vHnUWqmNhv7vAoK/tuCYOZNTkw6VwU8mz+gxahRCxqv QsyoRIPpw20VtClMTdcKvPGBkm13FJfIu5IpwoSE/L3HmA==