merge of 0b8f9c74e2214a11c23f2aa33fc6a56678bcc7d3
authorJustin Patrin <papercrane@gmail.com>
Tue, 16 Aug 2005 06:47:10 +0000 (06:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 06:47:10 +0000 (06:47 +0000)
     and b752d85d94a20d598011a40c207ef428f52fb94a


Trivial merge