merge of ebab7974168f9cf1be51590ec9e84f2ce521b7b9
authorJustin Patrin <papercrane@gmail.com>
Fri, 24 Feb 2006 00:08:23 +0000 (00:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Feb 2006 00:08:23 +0000 (00:08 +0000)
     and a6a03168696a3ef7ccf5c70555d492adc8a96d63


Trivial merge