merge of '0d7f35f44f5002f7df5f605bc373d3feecb8602d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 15:24:40 +0000 (15:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 15:24:40 +0000 (15:24 +0000)
     and '40bac439643c75e92f89252f0b5dfe329b2b8119'


Trivial merge