merge of 302d21decbd1d79c1094dfee3467af3dce7f2b80
authorMatthias Hentges <oe@hentges.net>
Tue, 28 Mar 2006 20:03:39 +0000 (20:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Mar 2006 20:03:39 +0000 (20:03 +0000)
     and bad98b28c8abd2db8c6e9a0a38da11c57881f29f


Trivial merge