merge of 'd5e892324794fc60bc2f9d3d05e2463b239b42e6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 30 Dec 2007 22:01:26 +0000 (22:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 30 Dec 2007 22:01:26 +0000 (22:01 +0000)
     and 'fec9ba8dd1d3f080f4ff412cd91e24d939767c8c'


Trivial merge