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)
commit3a2ed1fbdfa83cb69c6a1bf1311050070d7a97d7
tree4bfb087978eeb1178545bd712b433f5eb25bfd6d
parent8275e909cfe61880609a60921a9b9b816b79e08e
parentccee4d478f62721a480b89bc8a04352f7d0def5a
merge of 269ecf74ab47710eabc0ef60b75f09342ff542c8
     and bb52b63c802dd04d7feac4964f561b985cdb7247