merge of 543f1ae1d5c52bf6c18d56d34bb9f3aebcffdfcb
authorMatthias Hentges <oe@hentges.net>
Fri, 26 May 2006 09:01:56 +0000 (09:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 09:01:56 +0000 (09:01 +0000)
     and f58607b4b148968934281d92d207a505988286e5


Trivial merge