merge of '0b26a61d4fccf634b89eaba8f9db28208faa2d9f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Apr 2007 15:18:09 +0000 (15:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Apr 2007 15:18:09 +0000 (15:18 +0000)
     and 'b9551a5d956596f18cf5470cca74515df348392d'


Trivial merge