merge of 40758b8f78807bab8274eaa33560a44c6ac8ec96
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Apr 2006 15:19:52 +0000 (15:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 15:19:52 +0000 (15:19 +0000)
     and d3c662025b052c84cfcdc2153cd3cf75465bae87


Trivial merge