merge of 'e0c739838b7e6137895eca3e66135e7867b5bd5c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:28:05 +0000 (00:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:28:05 +0000 (00:28 +0000)
commita13444f76887801c62ca52afab154f5dfba4e6b2
treed20ceea0c7febe7f95c50b38d1be3d62afe281a7
parent5bda51aa63fae89e19c21ad83a4512c7f770a5e7
parent42ca8a066811fb46266631cce8d080fb1b311d22
Merge ... 'e0c739838b7e6137895eca3e66135e7867b5bd5c'
     and 'fe41ffdd352a53ebbd7737fb582b9d6a28e85a21'