merge of '4a4b64f21ff11ca4338f177d164f1dcaa692e856'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 22:58:28 +0000 (22:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 22:58:28 +0000 (22:58 +0000)
     and '5a59e5215a20353d7f6bad5289ae0daa45122644'


Trivial merge