merge of '6e9430a4e782e0542e8046eb8950843c594a3fc0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:27:56 +0000 (12:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:27:56 +0000 (12:27 +0000)
commitd507b32520cc3698ebc5d6213af6ac35838baf74
tree6263991bec90ebb2d8a700342de9e95f00d8c197
parenteb4830d4108da533f03d0fcef79206b99e6e62e7
parent67a41ab0a8ddfd847b78e5b339d06c39f133cabb
Merge ... '6e9430a4e782e0542e8046eb8950843c594a3fc0'
     and '9ebfa26d1a834b3ee52ebbb836458089347632e3'