merge of '179df98f22edaa74332b35d2b383a55ecae7f2ba'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 11:13:38 +0000 (11:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 11:13:38 +0000 (11:13 +0000)
     and '95790f96b79f6c36ad3f1f583d73e9d450736479'


Trivial merge