merge of 5ee09924caa605a3663fd8fbd303d4cd79e4ecab
authorRene Wagner <rw@handhelds.org>
Fri, 5 Aug 2005 14:49:28 +0000 (14:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 14:49:28 +0000 (14:49 +0000)
     and 6ac8ec9f9dd3a624de373184572b85148bd3c7bf


Trivial merge