merge of 'b5e8ca9e2938b9d08d831d84eefefa0b5443ab45'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:43 +0000 (10:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:43 +0000 (10:59 +0000)
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'


Trivial merge