merge of 37bf3a217cba75488f2f3a92ed7e78f540201ba1
authorRene Wagner <rw@handhelds.org>
Thu, 18 Aug 2005 13:20:56 +0000 (13:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Aug 2005 13:20:56 +0000 (13:20 +0000)
     and 56a384aab59612bd7493f2438a9d26c3c572a137


Trivial merge