merge of c70cc7660d061a9f9bb0fa1790b31bff0a914bc4
authorJustin Patrin <papercrane@gmail.com>
Tue, 14 Feb 2006 16:56:31 +0000 (16:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Feb 2006 16:56:31 +0000 (16:56 +0000)
     and e28b96e88f2e89ccaf7f4ba8e1a7f267883264e2


Trivial merge