merge of 006bbeb2da2090839ec05cdbd7cd825c900ac850
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Feb 2006 17:28:37 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Feb 2006 17:28:37 +0000 (17:28 +0000)
     and f144cf893311c20cf43f68a99c982431aa75861f


Trivial merge