merge of 883763a8bbaafe2d1fcab405b8e623657615d7ef
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 18 Jan 2006 10:55:20 +0000 (10:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 10:55:20 +0000 (10:55 +0000)
     and b4a513218154eb17b59ed896ac7e0037ab11fc14


Trivial merge