merge of '3c3da8a3266f52fdedbc998f8e7f9dd516cc43eb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 11:51:48 +0000 (11:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 11:51:48 +0000 (11:51 +0000)
     and '97d055550d55ba933c423fa657f7d63d18b81ed6'


Trivial merge