merge of ddc841bc5413de481ba5f7392575bba7a9ef04a7
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 23 Aug 2005 13:36:27 +0000 (13:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Aug 2005 13:36:27 +0000 (13:36 +0000)
     and f19ce428c20ed51be635a051213519acfded5d4b


Trivial merge