merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:20:51 +0000 (11:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:20:51 +0000 (11:20 +0000)
     and 'dd6e61bbe142013de981e7c21ec321925aa41d52'


Trivial merge