merge of '30914cc94bbce1be08b75646f1755f25e9f9f4e1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 11:08:39 +0000 (11:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 11:08:39 +0000 (11:08 +0000)
     and '6ffb91c6ed7cb12ad15b404b2661660cf1988445'


Trivial merge