merge of 18e53df44c1ad9ea6d82c04e90d3cd97285784a3
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 11:08:28 +0000 (11:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 11:08:28 +0000 (11:08 +0000)
     and 48fc87c05059719962a1476c799e02ab0b8bab1a


Trivial merge