merge of '09891fc0c32d5edbc72b7bc758c18272982e4a8c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 00:04:03 +0000 (00:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 00:04:03 +0000 (00:04 +0000)
commitec7f93f0612e1eb1f2f7e3386ed9a333f710b131
treec8dc816f48efebba367852ee3802f2542e06eba9
parentaa59c6f117e3223fd58faffd9947dcd94a3881d5
parentae704818de331a3d330bd5627cc3eb1bdd3a8709
Merge ... '09891fc0c32d5edbc72b7bc758c18272982e4a8c'
     and '41dbabec846e09b57a641cc8b83bf24be8cf0dff'