merge of '49e3b25caa2441cc80257be9db4cfae38d02f9f4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 12:49:39 +0000 (12:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 12:49:39 +0000 (12:49 +0000)
     and 'ebcdb1c426afec84f66e85e956dd5463868b1484'


Trivial merge