merge of 259a4ccadefe0737612a849ff810ce6a4debd589
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:09:23 +0000 (00:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:09:23 +0000 (00:09 +0000)
     and 5f40addfed07ed4b104416c2d8464fe20c5ba399


Trivial merge