merge of 'a582b05ef4bc8acaf2777e0d19dad2a5be6399f4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 16:41:49 +0000 (16:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 16:41:49 +0000 (16:41 +0000)
     and 'af0e8d200cec15db232120561f9607ee960928a3'


Trivial merge