merge of 95868ff13ffd9c5a92e6e0ae4637b3e07e4a626d
authorMatthias Hentges <oe@hentges.net>
Wed, 22 Feb 2006 10:53:30 +0000 (10:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Feb 2006 10:53:30 +0000 (10:53 +0000)
     and f0fcc9290eae0418d98a747b4b0150b74f438e09


Trivial merge