merge of 55616adc37fd37aa5b75ff09493523a3f11eb2e9
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Apr 2006 15:31:24 +0000 (15:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 15:31:24 +0000 (15:31 +0000)
commit43a499b782367210547e21c1f3e8aabdbcd2d29c
treed6d0504b3a3fa3a02363cb14d3ecb3e2aa6cd2b5
parent43b0c26db18fbceb32189326253fca41b5ef787d
parent5161b5fe592dadae4dda20e858baffb5e75b5725
merge of 55616adc37fd37aa5b75ff09493523a3f11eb2e9
     and a9dcf266b1c5bcea869b5f63ef5e8b7a2739b0f2