merge of '3cc9017ec1982d67d07a8059097acd2ee7b8c42c'
authorKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 07:33:42 +0000 (07:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 07:33:42 +0000 (07:33 +0000)
commit3e6c814794c2b9ad699b999e397cea8e95db139e
treeb9ddafa50cfc6ea915d93e8827534eb6112d6663
parent7e46fede90e31209865fd58e04e72107a2787166
parent2742ee7881b941263a051424cdacfd06a46da513
Merge ... '3cc9017ec1982d67d07a8059097acd2ee7b8c42c'
     and '87cb6d5388e06c52d5471051180223acb92bd54e'