merge of 9e6536f9c1c4b3b6b530f3531c01c96f931a7ca2
authorRene Wagner <rw@handhelds.org>
Sun, 21 Aug 2005 00:29:28 +0000 (00:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 00:29:28 +0000 (00:29 +0000)
     and a20806f8e80ed173473e201902c1d108f60b538a


Trivial merge