merge of 3c86c52756303961aea53564fbb7f1a252a712ef
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 15:35:47 +0000 (15:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 15:35:47 +0000 (15:35 +0000)
     and 6542f29774b37dc17f38dd5226a42f85eb3f9abe


Trivial merge