merge of 1ab0b6390e66e13ae36640a9fd9b65f9a0bc1b7c
authorMatthias Hentges <oe@hentges.net>
Mon, 3 Jul 2006 15:21:59 +0000 (15:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 15:21:59 +0000 (15:21 +0000)
     and 224211bcb23937fa650395e98198e8b84c763c51


Trivial merge