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)
     and 3cdaadf3573042323abd430b463d5b128034e0e1


Trivial merge