merge of '05e24f5610763d569f2c11c8f26e2152e34063bb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Apr 2007 13:14:14 +0000 (13:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Apr 2007 13:14:14 +0000 (13:14 +0000)
     and 'fc25101f37442915e9b2899a4383cb5bb412b44f'


Trivial merge