merge of 7f8c25c665b1a4c10bb8b79773f833ed97d5cdde
authorFrederic Bompart <frederic@unknown.openembedded.org>
Thu, 16 Feb 2006 14:15:45 +0000 (14:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 16 Feb 2006 14:15:45 +0000 (14:15 +0000)
     and ae31942b97ba423ebde9fdc4d30732681e69d6dd


Trivial merge