merge of '0d5ce889e37fadac205e4382869384682f077fe4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 23:12:11 +0000 (23:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 23:12:11 +0000 (23:12 +0000)
     and '53b57e99c7bb239b5233e2fd5f7ca598c33cba4b'


Trivial merge