merge of '5845bcf9f2b77a412308ab9b7bd6e383f6c902ce'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 08:50:56 +0000 (08:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 08:50:56 +0000 (08:50 +0000)
     and 'c761e84668658b2eb7b01e7ff9f0be78c8240e6f'


Trivial merge