merge of '9551a443b67af5912951314c6eae39950acd1ba3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:56:15 +0000 (11:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:56:15 +0000 (11:56 +0000)
     and 'e8ff77e628da5642375fa3f67e93d66d5418ffa6'


Trivial merge