merge of '9e2e029c381836af3e6c709f7c34a64fa970fa5a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 16 Aug 2006 12:48:13 +0000 (12:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 16 Aug 2006 12:48:13 +0000 (12:48 +0000)
     and 'bcb3d8772e830e87eeb88e0a5f581690f6d0cc6f'


Trivial merge