merge of 45a8c36fee40327f403ecf783f537bfd8cfec9fc
authorRene Wagner <rw@handhelds.org>
Sat, 13 Aug 2005 21:53:05 +0000 (21:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Aug 2005 21:53:05 +0000 (21:53 +0000)
     and ea8a783e9cd41e22c7c2dd4d7a11eeb578c7f631


Trivial merge