merge of '1d2340f5c0766711d217ca40fbfcb4cb196412ac'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 13:50:04 +0000 (13:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 13:50:04 +0000 (13:50 +0000)
     and '8bee8c12a8f566036b80dc740f5215782a19eb8b'


Trivial merge