merge of 'a3db419309941fac383949b8b58b338cc5742f39'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:28 +0000 (19:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:28 +0000 (19:02 +0000)
commite7a395a40026bc2409cac42cf669a8f6f0c51e51
tree42823eb472b9386efdef2a7830018adb8b192913
parentda52b3030fdab75fa015b9a4c7548ce391b54b35
parent4184f49bebf401c7f61aa045b0265c509b64df15
Merge ... 'a3db419309941fac383949b8b58b338cc5742f39'
     and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'