merge of 5254e94c07ba869651eddd2236db11a76bcd67c6
authorRene Wagner <rw@handhelds.org>
Thu, 14 Jul 2005 19:54:33 +0000 (19:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Jul 2005 19:54:33 +0000 (19:54 +0000)
     and 67b26231d055d48fc26d1ad2f8ba226d004cec9b


Trivial merge