merge of 'd0db4fe5ad1d91160b33f81ec5ebbbf8fec44705'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 16:07:44 +0000 (16:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 16:07:44 +0000 (16:07 +0000)
     and 'f1ebcfc050fa0c66cfe910e2aa31d1e069b99949'


Trivial merge