merge of 88f48c5aa876635c2ee02c93af2b2f3e66b797d1
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 15:21:07 +0000 (15:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 15:21:07 +0000 (15:21 +0000)
     and 8d875e3e0f79f3c0d11d7ee0371624b84c02e603


Trivial merge