merge of a1b31cd3f4c833b0f6a699e7a0e93514ddceed56
authorMatthias Hentges <oe@hentges.net>
Sat, 8 Jul 2006 07:30:50 +0000 (07:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 07:30:50 +0000 (07:30 +0000)
     and a894532687a7ea18f3f7ea7451cd75094667e084


Trivial merge