merge of '0a2c0b977acc12b551929c86418ebe390325056e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Jan 2008 16:02:07 +0000 (16:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Jan 2008 16:02:07 +0000 (16:02 +0000)
     and 'f72a0f688eea0a4559430f2d777a82a1324bd4d2'


Trivial merge