merge of '14dd1ebc66d8ff7879e828544c4b811a8b57489a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 16:19:06 +0000 (16:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 16:19:06 +0000 (16:19 +0000)
     and '1b8907dc6ebfe86113a2413b6b55a43e8b7a1add'


Trivial merge