merge of '2d48e0fc062c46f883515824089be8f20112f660'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 16:47:46 +0000 (16:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 16:47:46 +0000 (16:47 +0000)
commitdf5188bcb030b9ec67f62b7340deef79bf050f67
tree7ad165dc36d11ae1d45528c6748698b363430ed0
parent9a3be9e1943af1c7e54781e5de8d91794d3528bc
parentc8e82db9b83c0d457daa583644c0a77fbbc53256
Merge ... '2d48e0fc062c46f883515824089be8f20112f660'
     and 'a02852cd756c8f5d8eaccb9e4d36be9b524b0bfd'