merge of 3abff1bf232495168a2b305065a4da2954e5a9db
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Feb 2006 12:51:03 +0000 (12:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 12:51:03 +0000 (12:51 +0000)
     and 7130132bd2ec2d091cb9f34a849614afc5cca66a


Trivial merge