merge of 0a527a883f902e45560614ecaddc3e42e790c62f
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Jul 2005 11:56:14 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 11:56:14 +0000 (11:56 +0000)
     and 5288b95b97c705085dd03c40c5614edf9c248794


Trivial merge