merge of 158afdd838b31df26f6951d343eb64d7a3eb3909
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 21 Nov 2005 20:10:55 +0000 (20:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 21 Nov 2005 20:10:55 +0000 (20:10 +0000)
commit0a5d10b1dd4f6c36fe5a6f191b60adc4c1b549c0
treedde95c4ae308e5c6a4cdfcff4d8c90ad174e2dc1
parent53e004df0d4f9ee9ec75b6a590e026036936131b
parent27288730e7d038e9c2deb60bcea760fb19bc8a22
merge of 158afdd838b31df26f6951d343eb64d7a3eb3909
     and 3cdaadf3573042323abd430b463d5b128034e0e1