merge of '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 15:57:13 +0000 (15:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 15:57:13 +0000 (15:57 +0000)
     and 'cf2bb56e5f6bd283e65c7bf7c89c86e77dbd1fb0'


Trivial merge