merge of '038fd3d7de50165436251d3b2878a79da0607174'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 31 Dec 2007 08:05:01 +0000 (08:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 31 Dec 2007 08:05:01 +0000 (08:05 +0000)
     and '29321c56759c63d4b992d128e3457c12842cc569'


Trivial merge