merge of 8fb156c1063985412f3d3d473d7c4641b7c1ce8c
authorMatthias Hentges <oe@hentges.net>
Thu, 25 May 2006 11:59:26 +0000 (11:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 11:59:26 +0000 (11:59 +0000)
     and b04511549df1568005f531875b06fcbdfb7ee3c2


Trivial merge