merge of '2862048e0d5216ac90156a012c86db94c23d2742'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:11 +0000 (19:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:11 +0000 (19:02 +0000)
     and '42eff26099cde8822773944e3b244f74387ef7cc'


Trivial merge