merge of b709fb98bf1d4bd61921847f0a83d8cfb1c03504
authorJustin Patrin <papercrane@gmail.com>
Tue, 30 Aug 2005 18:32:12 +0000 (18:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 18:32:12 +0000 (18:32 +0000)
     and bf33034c282dd64819d4e41c15ee67d96dd56337


Trivial merge