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)
commit782823d984fe94d55820e63b2d9a5fc5e9948450
treea5db793a872a155750ba6a5079c6e10238a8a3f1
parent5e0f1e770e5721d45d9d3ceca49aee1901e5462c
parent8d442f4201aad8dcc782a9b53ec4a9c419c7e86f
merge of 0b1e74a13c861c0c4516ac25f7350e65026ba690
     and 57a2e56ac43af2e1db16eba23cf9c7f23f261bb3