merge of '1a297661067ec620e2c9c90e050d5b5f78991383'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 11 Dec 2007 09:00:04 +0000 (09:00 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 11 Dec 2007 09:00:04 +0000 (09:00 +0000)
     and '5480bec3f64046446cb2d5fdbba10a7a45e5d5f7'


Trivial merge