merge of 2653a4b40327fa4b9850b64660c0b840a53b9e4d
authorRene Wagner <rw@handhelds.org>
Tue, 2 Aug 2005 18:14:08 +0000 (18:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 18:14:08 +0000 (18:14 +0000)
     and 7d7a212e875a69547a4ab175f18225661a30c5ce


Trivial merge