merge of 0736c0c5d95f4460e2d4a3712c0220081eb862ee
authorMatthias Hentges <oe@hentges.net>
Sun, 14 Aug 2005 10:08:01 +0000 (10:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 10:08:01 +0000 (10:08 +0000)
     and af74a95d4b57909ef84341c9313fc3d4800ecd14


Trivial merge