merge of 26ad3f94c9657a7c1863c3ac7d31f1fa6c42b738
authorMatthias Hentges <oe@hentges.net>
Mon, 15 Aug 2005 08:20:36 +0000 (08:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Aug 2005 08:20:36 +0000 (08:20 +0000)
     and 65876316eaa0a47f796c7bf502478eb9c886d0b8


Trivial merge