merge of '2040fbc4df2aa380693c353ed60010c6857265d0'
authorKoen Kooi <koen@openembedded.org>
Wed, 27 Dec 2006 17:48:05 +0000 (17:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 27 Dec 2006 17:48:05 +0000 (17:48 +0000)
commita68c29774381ed759c536272caba3269a38e552d
treef714f422e2f527acadc206d569c23a60cd40f089
parent28156107acebb6a6e41876addf6eee7ce26af18b
parent967e0bcecd4e8477fa30e6d2066e671a4692d69f
Merge ... '2040fbc4df2aa380693c353ed60010c6857265d0'
     and '42910a78bf244958e7c8329dfa9474915a321d73'