# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jonas.oreland@oracle.com-20110627062601-\ # j8ceavnqsl9gyaic # target_branch: file:///home/jonas/src/telco-7.0/ # testament_sha1: de770ffbff6a9ea3841629c22e0a6a82f95629ff # timestamp: 2011-06-27 08:26:12 +0200 # source_branch: file:///home/jonas/src/telco-6.3/ # base_revision_id: jonas.oreland@oracle.com-20110625150707-\ # ygr0t6io4o5mf1ak # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQWiqpQAAwL/gEAQAiBd//// /3/emr////pgBzvvNc3F7a0PeNTSqthqnWg4SiKabUyamepMyZTymTCnqHqZqMNMk9TEZqDQ0epp oEpKTT2p6p7CTU9qg9QaPUAAyDJoyAAAABoU9EZNNRHqGmJ6QAAaAA0AAaAMQSJEaRPRpT9TNKem oxNNDQ00NADTQBoAADmE0BoDRowjQYjTEyYmgwjQMgGTASRJoABA0mpsp6npkCTGpk0DTI0AAZPU 9RSFWIGeBAyxZ0JGmgv9gt381H5QxJaInkhn3qw4r6Gvm6JmGg9C4YSO8VwYQ5HohScrmlkj8KSo 1JJRBMTSFzo/FrIKc2KQWPomBwDbTa4ee0GCx1WvGyHn7FCkpmiJEV7LnVD8da2vzaP4wTJvXVJ0 vO1lYmA7u9akExtgq/O6r4M1K9U8rLuM9VlCtJRCD21FANQkIoNi128ZPbM0YnDtrdJRmoSn1Mc1 Kl8grimWm9dFOWOncfvFVjJiJ7HYIZQh5WFtU41Bq0x8lvqkpmP05RoZbTOB9Z1kwtnU4ttcrkMZ pK4vrnplcoPvoxPiPakkjEOl8pOlaj4E4nTUxoVRhnEjEeKwnA/SBYeD6Fc8e2/OA+JqrOVB6PEU rU1XRVqzmgyEt1bDGEpKCgmXULICq+g4kglW3ch/mAdCe8aq8zmYmPjKiYBgIA67EZqZiUdqDT6y E0qHViD4SVbqJfdeWB6Z6SoMTVkNkygCfRn4nIQJxLdFFxXECpQKxHhiimxJCWgcKIh1JFzqEsDX goXPHJcsYNPplSPL7CJkVyqmN7NkGtkK2jHONZRAoJSKdgCcibBrh8YzIOshIj+lFFyMa8qHacw1 FbLaGBgiYme7MYHi2FsRFkx8R1mVl+rNircuGYvM6NbOESQ40qK5pSnLqNJcUkkGGOkhGduumwuW FZIDFDkbXFPkxKklURz6INkJabRNguWBTtnAvLwudz3dSyQjKSk1zGtUD6c2gTLcTj484bJ7aaXU jLbTViBIsxwtKZCjRhXeFVeufvLJCGeYuIm1hyJIw5OM9zj4xnruOHCw3ATOaZ66itlbYRuWHK4e BHNPWS4dzSSOBNXZFdY1jVY3ammYWprFSQOx1KaK7B2dkCm7YlLmZBODB5Vyp+Fgtik+Icq+wsA1 YKtBizKlaARPr4fa1EqoqrcQ12ZDdGbUgQYal6Fb4obrP5Q2f2OxzD0Ja3jJZsYdzkGksPkYtcV7 Ay/MwLHfjbdXhWjeWJsFFUXtQlIGvTT6F350Nlsy4an1hr72HDcMiiAwxL65CHcfQRuriE8400gu 0f1Ung85sd1iJnPc5S7FqvD3Ilw0gV/uOSdL5K7UgmiZLnwupTJTztoYFcZ1Kh6hiAG/Nt9ekiQs ilvbw9lsrkp8smg5IGR4zdvHLtv1mqsc81chMBdV0Q1wz4DsJZ8l/E9WYSyyVdQ4ugh0+rkUFSNh GMjklk1kI5NMODJcBk6fxGy2WbYWPonKwsoCk5ScbZ0RJAUC5SkPKyVpcbB9heypuOJwXZp5i2wI HHAxGXYwPZh6NVN1XMxDlOADl3hxZmoWmraMbiKLQUSwMnTWUDIhnCSiuBLTCoyiuWDD655drdPB yxCsG1sfcmCRnwjctJ1DpfEZL7E64BpXbchairONYtN+ogJGg2lnOPTNtydQOnFYIXtOB1UKRMBy 0N7yci3FhNMI2QP5gDYNtptA2TJGg7a4QNpGnf3IUS3jz4CG579GEul6jskJqBLQjEoYmTeM3ePa TgMdHUk3KU2LehXDJUNIWGc60YMZFZH9YuGZkN5OaTSrUcbzUXjnYj282cyyOioMrO3mA24r3npT D6M2w4BetiMDA0eYu2+XyI0I0WQCADIURusoC0Sc62Q923i5VWhd07+huD6jOuwgAUjJUkhGw2LU UMt9vrEHLNTUtw6V1uwsMuhrVdm77iWIh62bI8xOEKsdDAq98VepA2hYWR+FLskqUsWPGQDlEKmZ nuoXFQDK7AhpZwzqcKTDIQsvBXJca26jS0NcaphKDb50d+ALXFB5xkMybxk6wJbg7xLxpZQPOC2e EF0kZRZym3EzSmQwS7+oHNvkYYL1w71pS80lE1oxXWRNBs46BSWawDb6gfCBUi5kZQlhBGlosc+B T+UgKtLUb2M3a6mK4886JDSeGbnmhrsnZNrGRb0L/WydbbCvWyTTtoTnkKgUkUarji4cxP8hnp7H WJo0bShG4iWlzHWB5T0M9EvCUvKqnDT52Z/nucvRgVE8JDsKTLtW+B4NOy2EXCK9UFAb2LNbTPCi WZSMNODLcwbJySZ7sJZtGRm1vUVzhpqQ7arC4tLUGahMUwINFwwJtJN3bKzp9y6DlrLCU6DG/IwK Ouks4tVOeadYo22gSqGW9r1ePr1kMeRaWUpVAZwLyZMsBK/NUhDVqh3/UKqi/8XckU4UJAFoqqUA