merge of c009bb7a8231ab8c429364e170366207097c6c01
authorRene Wagner <rw@handhelds.org>
Wed, 5 Oct 2005 13:18:48 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Oct 2005 13:18:48 +0000 (13:18 +0000)
     and f455175a8c475812470ebe3bf0c643a9b0bb30d4


Trivial merge