merge of '072966cba710b512bdaeb39992db259a90fb7fdd'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 10 Jan 2007 13:07:00 +0000 (13:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 10 Jan 2007 13:07:00 +0000 (13:07 +0000)
     and 'c75b2afa1a69147279b15626fa985f3fcb4f1ce1'


Trivial merge