merge of b118b8c9292e3a2ce682bc576f53e7d295dd3da4
authorMatthias Hentges <oe@hentges.net>
Fri, 5 Aug 2005 19:05:40 +0000 (19:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 19:05:40 +0000 (19:05 +0000)
     and db631e19abd4d2b1049a24b5d7ea623dc8673a99


Trivial merge