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)
     and 5ce32db4a4b875809b5c8088f1c96b61c15e7bd1


Trivial merge