merge of '1054ca4965286d532ebc6789997a44625d410958'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:50:57 +0000 (16:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:50:57 +0000 (16:50 +0000)
     and '40243c3b0cc351c447c35cf09151051adc2d657a'


Trivial merge