merge of 'e598cc999e9e7eefa6ce1cf9b440e869d9d61d28'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:01:28 +0000 (12:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:01:28 +0000 (12:01 +0000)
commitcd0b9b9d930c43d68fa6b0876f28251c475a6bb1
tree16adbac39670d70b19c865b11948872754e55e49
parentc365e2b6a2f63c002aa11c255ebcb90ef22a7d38
parentf8353737b039b8470a75280ecc36d9446322955f
Merge ... 'e598cc999e9e7eefa6ce1cf9b440e869d9d61d28'
     and 'fed7957a10077b7dd7ba72689833e152fd94d766'