merge of '1f2f012d4e3072be1a917b5e7a8798d0990b2134'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 08:57:18 +0000 (08:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 08:57:18 +0000 (08:57 +0000)
     and '8d5edb15fd62844024c79d94ed5d6b8da85d0d36'


Trivial merge