merge of '15617f31c93e5e7e35627af8b363148f69541579'
authorKoen Kooi <koen@openembedded.org>
Sun, 10 Sep 2006 08:59:47 +0000 (08:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 10 Sep 2006 08:59:47 +0000 (08:59 +0000)
commit62a86cd1cae6025b0234889119507af43f5bc24a
tree8c9d932efded8eae2a74fa8aa5e63ae19f602205
parent88bdba6d70a69e84781612060954e2f73ab07b6e
parentbd246d9a4b143fa5766e9b2d86676d35971ecef6
Merge ... '15617f31c93e5e7e35627af8b363148f69541579'
     and 'c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a'