merge of 0a527a883f902e45560614ecaddc3e42e790c62f
authorKoen Kooi <koen@openembedded.org>
Fri, 29 Jul 2005 12:45:43 +0000 (12:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 12:45:43 +0000 (12:45 +0000)
commitfac613f699ebc733ad24222172f27bd4cb3fcc0f
tree90772dba548f445f5a069d0cdb12998d93afa200
parent431f3ab1ac2959a4d81bd75b5498c5ca1c529785
parent07d6dfc1c87b7bf5130ca2e609e07271c4f67a95
merge of 0a527a883f902e45560614ecaddc3e42e790c62f
     and 3e210bb0fa7fb81d3595767cca49ed749b921f1d