merge of 1ac9a4a5dc21044643760bdc04d49ea3b67e2fe9
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Jan 2006 12:32:19 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 12:32:19 +0000 (12:32 +0000)
     and 89b50baece913cead5c49dc80063b2541dcad4cd


Trivial merge