merge of '1ee32088f5f2a9a808845cf1074bbe5566d7be4a'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:16:59 +0000 (10:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:16:59 +0000 (10:16 +0000)
commit27d718fcf90567a8be2f694e01a6878d1a070118
tree307514267ef2849fe0c3bf898980ddbf4ddf0a5f
parentb007bb8a853a60ab918584da2e89ca75b21ab543
parent5a7bb23659fa97a1ac55bf6769605cf342a62911
Merge ... '1ee32088f5f2a9a808845cf1074bbe5566d7be4a'
     and '6651fb704192756bf7c80d213d5cb1e48a1541dd'