merge of '441bcea0ba57eb2b93c3337a770e15a243b489e8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 10:51:51 +0000 (10:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 10:51:51 +0000 (10:51 +0000)
     and '8c2e3e8095dc7b333dc78aab31ac1f04f447485f'


Trivial merge