merge of 1259794e0c84040e49ab53241786b7c7689b69b5
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Aug 2005 09:33:22 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 09:33:22 +0000 (09:33 +0000)
commit3ec7ed7cf8e972422483bb847774cdbe8e24a5f3
treed836005dd06a0d2ca0e1c7523b9ee622d31a9d10
parentedce4dd383f5095415ab1e90bafdbcf0c22c673a
parent87c1efa49a0e7db9666aff9bf729adee2bb5ac55
merge of 1259794e0c84040e49ab53241786b7c7689b69b5
     and 6f2e2d1cbff36ea646f11c263458c798a60321c8