merge of 0fbc5bc9e4e013e53c6e2ad33a14cf971844ac61
authorMatthias Hentges <oe@hentges.net>
Thu, 11 Aug 2005 17:56:37 +0000 (17:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 17:56:37 +0000 (17:56 +0000)
     and c2a4ba0685c8f08c743c55860ef182e1391a590a


Trivial merge