merge of 6ce286acc5aed59832502c3ad006c1d171a4bb5f
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Nov 2005 13:46:05 +0000 (13:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Nov 2005 13:46:05 +0000 (13:46 +0000)
     and b053e84187fb373b9060e7a8602747ee924da19f


Trivial merge