merge of 2aabdd81a27bbf17ccee6c78a6e49d74e5a9719f
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Nov 2005 13:43:20 +0000 (13:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Nov 2005 13:43:20 +0000 (13:43 +0000)
     and ad628b53bae19dc9cca0f00722bde77ec3e339b4


Trivial merge