merge of 0b1e74a13c861c0c4516ac25f7350e65026ba690
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 30 Aug 2005 14:29:02 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 14:29:02 +0000 (14:29 +0000)
     and 57a2e56ac43af2e1db16eba23cf9c7f23f261bb3


Trivial merge