merge of 0c48b57e5d9ae8615d0e0c65bebc171a6b1bcbd1
authorMatt Reimer <mattjreimer@gmail.com>
Fri, 24 Feb 2006 00:07:30 +0000 (00:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Feb 2006 00:07:30 +0000 (00:07 +0000)
commitebc6433df0d6d3151d0e63813c1f5dc476c44388
tree8a0eca26e7368b078987c4b9d8b4822a7f08a603
parentaf0b22faae7e37bedc25086f6a22ffa975399cfb
parentd39e4f40fa8656cf4f83d5d2b5cdac2eacd487ea
merge of 0c48b57e5d9ae8615d0e0c65bebc171a6b1bcbd1
     and 238b40a012de45582f1cd93b76743b4613edad7b