merge of '3ab13564266d48c610004a9570479df65c0ee659'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:15:35 +0000 (09:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:15:35 +0000 (09:15 +0000)
commit288c0fb960bdb5f6e58cf0f67ab197744fd08aec
tree45a00f85bd6a40ee0c518901086ae7bddf23facd
parent1ed9ab387ca41ed227fa4b9e054634a678454657
parent22a5bf66c7e250aa9b8a9543375e45855c1704ff
Merge ... '3ab13564266d48c610004a9570479df65c0ee659'
     and '5ac8d930d208290aa8f5f13dd67120ed845441ed'