merge of '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:04:30 +0000 (10:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:04:30 +0000 (10:04 +0000)
     and 'f0261ce1c4acd6350d91bdaaf2939442d84a222d'


Trivial merge