merge of 1beafa4fcb9ecf190124315ed93b26f68496cff2
authorRene Wagner <rw@handhelds.org>
Tue, 2 Aug 2005 11:46:34 +0000 (11:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 11:46:34 +0000 (11:46 +0000)
     and d16bc24438423bde7907f19a631f690c0315bfdb


Trivial merge