merge of 0db003fda92c4fe80ee76010788aa8e895b485eb
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Feb 2006 11:06:23 +0000 (11:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Feb 2006 11:06:23 +0000 (11:06 +0000)
     and 84edeec7571f3127230e5ca62b68488474946bcf


Trivial merge