merge of '764fab90ce78632168aaaa389123bbc7beacc0af'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 18 Nov 2006 09:48:40 +0000 (09:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 18 Nov 2006 09:48:40 +0000 (09:48 +0000)
     and '9ef42c4cea604726d2f11a3693579baae9320074'


Trivial merge