merge of 885d90470dc44f85332ae3b62f38a1f1cf91b4c5
authorRene Wagner <rw@handhelds.org>
Wed, 17 Aug 2005 18:22:44 +0000 (18:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 18:22:44 +0000 (18:22 +0000)
     and c9530ced58773f4fa9498d173533e73615774c22


Trivial merge