merge of 9d680ed94ee3622289ca2e365ea21a4fe475b650
authorMatthias Hentges <oe@hentges.net>
Sun, 12 Feb 2006 14:01:00 +0000 (14:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Feb 2006 14:01:00 +0000 (14:01 +0000)
     and a6f5fab8fef608fbada37e8e35857ada2aa931da


Trivial merge