merge of 11bb54e0cf52d0c5a23e20076d3797d35cd2e8e7
authorMatthias Hentges <oe@hentges.net>
Thu, 18 May 2006 23:56:45 +0000 (23:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 23:56:45 +0000 (23:56 +0000)
     and de9dea3c1dd5232fce950643ca58e4130e837c37


Trivial merge