merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Aug 2005 17:00:41 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 17:00:41 +0000 (17:00 +0000)
commitda2d1d094813cd5fd15bca26c1ede82db4d0e0ce
tree1a88ea9f4aaea4894ab482cb76a49798ded523a3
parent57e9d2faad832e99be6b1ba6cbe9e743b5b99e3d
parent8c0d10b8635116bfa6caafdd5b24be62a0ddba10
merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786
     and 8746aa49b2d44b03e77f44c96aaab655c6477034