merge of 'd0db4fe5ad1d91160b33f81ec5ebbbf8fec44705'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 16:07:44 +0000 (16:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 16:07:44 +0000 (16:07 +0000)
commit5aa891aadd2e06ecc54f1f0e189c508fe230f866
treef79947d6c68f72dabd5c91f5d24f9bbd166096f4
parent7ca1c6d3022ec7dd272d243f00d8a8d0cba59c85
parent3f09a0e0a772591f37599d725190bb3b0b09a356
Merge ... 'd0db4fe5ad1d91160b33f81ec5ebbbf8fec44705'
     and 'f1ebcfc050fa0c66cfe910e2aa31d1e069b99949'