merge of '6af5be50367621ab5838c9f4dc4e831a81c1d225'
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 13:36:16 +0000 (13:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 13:36:16 +0000 (13:36 +0000)
commit341eb35a43af8d2240d8118851f0cc1bb6145b36
tree8876dfec8af541bc06384dba6fe5db97a4e957aa
parent9cb1dfaef02a843aefddbce9d07738c960293dc6
parent13b1746414d7674c0dfc3e53c4a9c92d8c6c8288
Merge ... '6af5be50367621ab5838c9f4dc4e831a81c1d225'
     and 'fa302963f7d41e6cdf3efbde3458b3731e8ec5ae'