merge of 034e3efa6ef57ca55cebbeeb39b7546ae1454e36
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 2 Aug 2005 16:42:36 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 16:42:36 +0000 (16:42 +0000)
commit516ea71ffd9e6f55074a1e3706c1f85783489200
treed4a775a993d29207fb157692a9c3ee70513c2a8b
parente1d810e915c961d01100a697e9c077328048ffd4
parent6e9c13bef7bb3e61ce83bd73835981baef9bcf99
merge of 034e3efa6ef57ca55cebbeeb39b7546ae1454e36
     and 4283ff06b5f924e60463c8d1814b4a3ace429898