merge of '0285e32ca4006ec769b788f9d74dac4d57326bf4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 16 Dec 2006 15:50:53 +0000 (15:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 16 Dec 2006 15:50:53 +0000 (15:50 +0000)
     and '08336880338eaa13f4281f4b644f44ab9fb3014c'


Trivial merge