merge of '383183a2b07cc7894a0c38bf198acc5f5f97fec1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 09:10:39 +0000 (09:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 09:10:39 +0000 (09:10 +0000)
commitdbc46dd3c396d1d9938f131323c125704db9e64c
treeb1ad0ad65523e34ef69e510c23743a7287b5cf74
parent1b42f355f5e621f126b9db86cef8419509ed1e13
parent587f9f658071292d11491ef26cb2d81f0e3c9e42
Merge ... '383183a2b07cc7894a0c38bf198acc5f5f97fec1'
     and 'c8a04b4c21aa3cccc256c033dc9532d6dc88be53'