merge of 37fc56a61784036cba34459336e8498d980243a2
authorMatthias Hentges <oe@hentges.net>
Sun, 16 Apr 2006 12:46:39 +0000 (12:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Apr 2006 12:46:39 +0000 (12:46 +0000)
     and 80830d28dad51d1eb0b440e79ba54aab338b13db


Trivial merge