merge of '4326959c5e60e2f30639de951de06bf46a10e335'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 23:29:54 +0000 (23:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 23:29:54 +0000 (23:29 +0000)
     and 'e40db82fe5785a6b7427f050901caa4bf1fc691f'


Trivial merge