merge of 24e9a57c16a592bd13ccd1e8cf31feac9a2510a3
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Dec 2005 14:21:19 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 13 Dec 2005 14:21:19 +0000 (14:21 +0000)
     and d4e0f069245e5657ad844349d78d5b45d9e02d3c


Trivial merge