merge of '0721559f76e0aaf9b2151c4ad47b5f5e77f92ea4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:22 +0000 (12:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:22 +0000 (12:13 +0000)
     and '4ca56810304293da744170c82e50552f5dcf084f'


Trivial merge