merge of 269ecf74ab47710eabc0ef60b75f09342ff542c8
authorJustin Patrin <papercrane@gmail.com>
Tue, 23 Aug 2005 22:17:00 +0000 (22:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Aug 2005 22:17:00 +0000 (22:17 +0000)
     and bb52b63c802dd04d7feac4964f561b985cdb7247


Trivial merge