merge of 306834bf0afc5bbcbeb23e82545629c967983bbf
authorRene Wagner <rw@handhelds.org>
Wed, 24 Aug 2005 16:31:01 +0000 (16:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 16:31:01 +0000 (16:31 +0000)
     and 936ba133ee1bf0c175548350fd1a973a8054b138


Trivial merge