merge of '38e38f27d81c78058d1cfa4e57d5cf1c52981c7e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 06:35:37 +0000 (06:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 06:35:37 +0000 (06:35 +0000)
     and 'e3ec97ab62819c73e0116db91b2b7b2cb5a52ce6'


Trivial merge