merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 12:14:01 +0000 (12:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 12:14:01 +0000 (12:14 +0000)
commit704fafa6aaeb82cf39068fc80decd8dfac31a9e6
treeee68b1b75b8c2b6fe6a669ed1f6f6179d6704556
parent19711ba264ecf5b93f70f73896608aca29cadeef
parenta7dd97057e4ff21b76276f1c89123e02dab97faf
Merge ... '091511591b5d369f5f183c5300585f7f1b3ca830'
     and '91d52cdc54af4a2802967cfdab32c81d01922351'