merge of 146608cb9e3b0c4ee68e611a117558706e6cbecb
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Jul 2006 16:14:47 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 16:14:47 +0000 (16:14 +0000)
commit9d5f6d0dd32f5f3378c9692c362a204e804f5250
treefa3012f6227275e0107c2c917835964532e7a3a4
parent336ccfe6e95e0db69098c5dad1d56adec0b3cee2
parent4fb67e9bbd384d86e3fb66bb8ac1ae665c0fac6a
merge of 146608cb9e3b0c4ee68e611a117558706e6cbecb
     and 6daf673dad5c7bf9a40a8de599ddd3e43c9c2a65