merge of '038fd3d7de50165436251d3b2878a79da0607174'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 31 Dec 2007 08:05:01 +0000 (08:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 31 Dec 2007 08:05:01 +0000 (08:05 +0000)
commit275f358d054ba5c4721cfe87edaec8202ee8095e
treecd455b3560deb735b8b1615f690a13326089e011
parent71cb087ca185adcf99c8c1a7cd36e7e0fe38183f
parentb957b09c9e9af2b94365598c84254f82019844bf
Merge ... '038fd3d7de50165436251d3b2878a79da0607174'
     and '29321c56759c63d4b992d128e3457c12842cc569'