merge of '11a5d1e39dfa8f07f966376ef34897af5fbb0dc4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Oct 2007 20:24:34 +0000 (20:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Oct 2007 20:24:34 +0000 (20:24 +0000)
     and '639885e0849ac3372f3d8cd67349b16fa59b42e8'


Trivial merge