merge of cfbb957e3ada5af6623a77618cbb69b758ffa0df
authorMatthias Hentges <oe@hentges.net>
Sun, 16 Apr 2006 12:32:20 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Apr 2006 12:32:20 +0000 (12:32 +0000)
     and fb37f14ba39a48391acea0b175557d1be9cd9e43


Trivial merge