merge of '7766951901c250170ac71fd9268ec9c8e230e2e3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 20:04:58 +0000 (20:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 20:04:58 +0000 (20:04 +0000)
     and '96fb434736327df64b56d0ab9a6a36fcf759486a'


Trivial merge