merge of 569bea40cbdd5df22789ea7739aa76e3942c869f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 22 Mar 2006 16:20:30 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 16:20:30 +0000 (16:20 +0000)
commita58e94dfa7b252aecbb2894e095785e85e61f3b0
tree63110a148df1b470b82f5f6f233011ebe5e84ccf
parentd3442baa242f13920cf2a7b94f5f68bf5ccfcdb2
parent7cd58c1423e7b9c7a53137a8d65ab6ed83844544
merge of 569bea40cbdd5df22789ea7739aa76e3942c869f
     and ae3c659952dd916d2d6da191c1562023c84a6423