merge of 02169d766c8620f531bb081faa58a6d1c2277f1e
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 21 Jun 2006 11:45:52 +0000 (11:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 11:45:52 +0000 (11:45 +0000)
     and 0e599c9a0360342db2527204c85039a49aec6d93


Trivial merge