merge of '0b6935355f7d83e008381e3bc46345a5f8c686d9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Nov 2007 16:49:20 +0000 (16:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Nov 2007 16:49:20 +0000 (16:49 +0000)
     and 'e48283e1dd58b2449622e99ee8018852bac6e0fa'


Trivial merge