merge of 063f5fcd2659dd00fdd34f052bb22a04c2558a5f
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Oct 2005 07:49:42 +0000 (07:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 07:49:42 +0000 (07:49 +0000)
     and 8cb9fe0395955b9160edc9f54e42830aa08e5823


Trivial merge