merge of 03fd4d06deb0ac1de761650c03d3b56f3d217c49
authorMatthias Hentges <oe@hentges.net>
Sat, 20 May 2006 08:54:31 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 08:54:31 +0000 (08:54 +0000)
     and 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06


Trivial merge