merge of 28210fb75ec4808b4be18cbc6efdc2b98f653b26
authorMatthias Hentges <oe@hentges.net>
Sun, 14 May 2006 21:57:26 +0000 (21:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 May 2006 21:57:26 +0000 (21:57 +0000)
     and c47d795cbd5120c0afb4380b88351bc24862e5c3


Trivial merge