merge of 6b0fa032aaf561cbe35dde4c36afbabd8f8ab47b
authorRene Wagner <rw@handhelds.org>
Fri, 19 Aug 2005 15:24:34 +0000 (15:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Aug 2005 15:24:34 +0000 (15:24 +0000)
     and 845f932890628e6c650909f15f2585f2b763ace8


Trivial merge