merge of 27e5267a63cc6eabfebf01fa54915c4307784a99
authorMatthias Hentges <oe@hentges.net>
Wed, 5 Jul 2006 09:07:48 +0000 (09:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 09:07:48 +0000 (09:07 +0000)
     and a4530adaede8ce3c1c526690dfd21618ecd54c72


Trivial merge