merge of b9308de4d2d1072e26d134bd4eada0efa17993f6
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 12:32:45 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 12:32:45 +0000 (12:32 +0000)
commitd25409164d0ce017b9703c9c1e60a0587f4f5f2f
tree7ad63904bd065addb4ca76f70f979d4e494ed67d
parentbde705e9d300d987bdaed6f94e534182ec6201f5
parent530227dfcd82122db8963f9014b906122fa6f62d
merge of b9308de4d2d1072e26d134bd4eada0efa17993f6
     and efd8840244d74e5cab246e93e24993c96eeb9db8