merge of 309ed8790b9b5f6e51c3bd638a7861ab23c24416
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 16 May 2006 21:28:36 +0000 (21:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 21:28:36 +0000 (21:28 +0000)
     and f41f4b9e61ac9fa58e09e00bf7a7514ce93fb723


Trivial merge