merge of 77736f36e9c894217b164958bb407338174f2777
authorRene Wagner <rw@handhelds.org>
Thu, 18 Aug 2005 13:22:12 +0000 (13:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Aug 2005 13:22:12 +0000 (13:22 +0000)
     and 8ebab72775864cff158b0101509541cf76aa384a


Trivial merge