merge of 197281d5c070515d756b2679b2e5b25952f3fa14
authorJustin Patrin <papercrane@gmail.com>
Sun, 14 Aug 2005 17:37:15 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 17:37:15 +0000 (17:37 +0000)
     and e0ad7669467beb214dbbaa5169e94b07b29044c8


Trivial merge