merge of 2d9229c5d5599b6452b58e1bd6237f75be857428
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Nov 2005 22:09:20 +0000 (22:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 22 Nov 2005 22:09:20 +0000 (22:09 +0000)
     and 57be2e37d8f61e00f3da6c2d5362490f4071a500


Trivial merge