merge of '63a6f6349530accb6a38bc556a6c380e3bf4d32c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 10:17:54 +0000 (10:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 10:17:54 +0000 (10:17 +0000)
     and 'fa537f6eaeafcf8b7b132dac16e7eeb204ce8a42'


Trivial merge