merge of bdbeb53fb07854a8484b17504b9ab11113e0fe51
authorRene Wagner <rw@handhelds.org>
Sat, 27 Aug 2005 00:35:47 +0000 (00:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 Aug 2005 00:35:47 +0000 (00:35 +0000)
     and fda50be34c5e8aeb2a40fcb38520b83eea2db043


Trivial merge