merge of 31c249abc696ce980417cf47b06891a67f02e166
authorDavid Karlstrom <daka@thg.se>
Sat, 20 Aug 2005 14:53:35 +0000 (14:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 14:53:35 +0000 (14:53 +0000)
commit6e01059f9f4306d853fd56596e55a91867836b3d
tree58c801ba98cb6a6333d8b4a131e4334ab30c4a3e
parentabaa8fea5f1ded98c0e701fb3657455a0295700b
parent1a7df4494bc9678334ed1ba386d4083777c41aed
merge of 31c249abc696ce980417cf47b06891a67f02e166
     and e951982319017716291e547c31cf1a75b2ccd676