merge of 67c06308e7dc7f4e91adc69fedea16ec131bb45e
authorRene Wagner <rw@handhelds.org>
Wed, 24 Aug 2005 16:27:50 +0000 (16:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 16:27:50 +0000 (16:27 +0000)
     and ab3bfea881e8e12863a1707268606b7f864d1dc6


Trivial merge