merge of 31055e640cd3ed10f565b48ba9c4ef57da2243cb
authorFrederic Bompart <frederic@unknown.openembedded.org>
Thu, 1 Dec 2005 17:06:33 +0000 (17:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 17:06:33 +0000 (17:06 +0000)
     and d72c18a4bdb40a69e578b041fe714f31487fcb1e


Trivial merge