merge of '9f1fe2504c55293cd4cdd2e508adf582c8ae44c3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 10:07:19 +0000 (10:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 10:07:19 +0000 (10:07 +0000)
     and 'c33637ccb4f9f6285140370561048926fa0c712f'


Trivial merge