merge of 15add738eb54d20132cb520348c334580b071e35
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 15 Mar 2006 11:53:13 +0000 (11:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Mar 2006 11:53:13 +0000 (11:53 +0000)
commitd19d916dbf8abda555de850c0ed23faf2f54b754
treebcb1ac8ef84373b1e39671f56df059d1d120f421
parentceb0e05d0288e65524b852dfde15550e26645df6
parentd13251e03b8cd810205120600d034c73f0fa02e0
merge of 15add738eb54d20132cb520348c334580b071e35
     and b08ae13eaefb15f3a4908e4d72a9fcf212733c72