merge of '47d594be43a773db8f35b058cc2d3113cb26f441'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 13:47:22 +0000 (13:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 13:47:22 +0000 (13:47 +0000)
     and '66e89031d52c1b27eb48a89e6155eb9ed5dc352e'


Trivial merge