merge of 784fefbad71c3505470368a578f10f698b47068d
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Apr 2006 11:59:06 +0000 (11:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 11:59:06 +0000 (11:59 +0000)
commit8976d52059d279621083343652ef2c23cae23da2
tree7998c104c9075ef98f333849a9d0d0fcb95564ba
parent8f3cf7b38fa2b34b47d5d12bd4f27b5930ac3802
parentf65285a79a3db5abbc28efe7cd61f36bce3a898d
merge of 784fefbad71c3505470368a578f10f698b47068d
     and d28fb7268cf69c4ca2450e6581fb928a7027f78e