merge of 1bc6b07e0b8d51411a95e5aec7dcf5af6ae2c9e3
authorMatthias Hentges <oe@hentges.net>
Mon, 26 Jun 2006 10:57:03 +0000 (10:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Jun 2006 10:57:03 +0000 (10:57 +0000)
     and 7d3f1a525d3ba62317b1dc19c6b340d5a8585918


Trivial merge