merge of 44115488650c08fa9e7a173d464a93aa0dcec1e7
authorRene Wagner <rw@handhelds.org>
Thu, 14 Jul 2005 22:43:17 +0000 (22:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Jul 2005 22:43:17 +0000 (22:43 +0000)
     and fbe23ed6c03abf7163d310bbd0e402428c1bb40c


Trivial merge