merge of 0aa8df480a5fe2c0daeaff3c39171cce7fde6a4a
authorMatthias Hentges <oe@hentges.net>
Fri, 26 May 2006 09:25:34 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 09:25:34 +0000 (09:25 +0000)
     and cbe9e2ec3566ef5af4fa806a0faec1ddf3984cd4


Trivial merge