merge of 'f537311d9440fd345dc036915c31a41292d8e978'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 16:39:10 +0000 (16:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 16:39:10 +0000 (16:39 +0000)
     and 'f93795c41ed1896ee6ca1fce9cf1a78b7d95b18b'


Trivial merge