merge of '45ed69e5efc5ba31b80dc1e00747aeb58424e6c1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 17:20:38 +0000 (17:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 17:20:38 +0000 (17:20 +0000)
     and '6b37af53d60c6d9e3798ab204b051841dd3291de'


Trivial merge