merge of '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 09:25:38 +0000 (09:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 09:25:38 +0000 (09:25 +0000)
     and '350557edbea2aa55107ce4c0e4dffc849b7e2307'


Trivial merge