merge of b9b66b086ae9b09598a4e46d6864d9ef07f3cc0d
authorMatthias Hentges <oe@hentges.net>
Thu, 18 May 2006 11:53:05 +0000 (11:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 11:53:05 +0000 (11:53 +0000)
     and f46af8d8602581214b59314f71fbd9fcdfda0fef


Trivial merge