merge of '666358c5490cf7ad12c0b64e3e81b9d28fde6536'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 27 Apr 2007 08:23:05 +0000 (08:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 27 Apr 2007 08:23:05 +0000 (08:23 +0000)
     and 'a1a53de4dc6cdab69af325b6a2615e1c4b40caad'


Trivial merge