merge of 04e09174bf8e53fb7de4e212a13de0b81d84852a
authorRene Wagner <rw@handhelds.org>
Tue, 2 Aug 2005 15:43:11 +0000 (15:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 15:43:11 +0000 (15:43 +0000)
     and 4f4974b1e0b55a76b583284d19b23335d0184bf0


Trivial merge