merge of 1fd7665c4adb18dbc8ea2095452ff1fbac9c02be
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 13 Jan 2006 21:23:10 +0000 (21:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 21:23:10 +0000 (21:23 +0000)
commit6b0416e0b125a9552582d0ed9f3b8795a5762285
tree21ad82dc0dc48b49c10c7c150ea60e8bd1a2905d
parent5a066b8ec9a680169470348b674b7c57b50f4e29
parent56b1057bab4928e8faee67ac81d0614410dd4d07
merge of 1fd7665c4adb18dbc8ea2095452ff1fbac9c02be
     and 5ce32db4a4b875809b5c8088f1c96b61c15e7bd1