merge of 0f46196206904515c0939c84c80210e251c74960
authorFrederic Bompart <frederic@unknown.openembedded.org>
Tue, 20 Sep 2005 07:27:59 +0000 (07:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Sep 2005 07:27:59 +0000 (07:27 +0000)
     and 5ec5f2c198db5c371a9cf2cada82144032025895


Trivial merge