merge of 0be90c0033737c7d37a25d8cd1aa94037e680561
authorRene Wagner <rw@handhelds.org>
Tue, 2 Aug 2005 17:33:34 +0000 (17:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 17:33:34 +0000 (17:33 +0000)
     and 6e5ce0dceab57662bdf528c2a40bdf3dc557013f


Trivial merge