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)
     and 'fe41ffdd352a53ebbd7737fb582b9d6a28e85a21'


Trivial merge