merge of b415ab8f4974d9175f84b48d1cb18563161d8da7
authorPeter Urbanec <toppy@urbanec.net>
Sun, 28 Aug 2005 14:25:44 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 Aug 2005 14:25:44 +0000 (14:25 +0000)
     and e98e2ade5d50176ea17a627451ff8d233ac9a4ef


Trivial merge