merge of '7ecf0e32974264619fa996b2de3f674cfe2ef705'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 08:23:00 +0000 (08:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 08:23:00 +0000 (08:23 +0000)
     and '91440474738896e262f00721ea8c0887714b5e58'


Trivial merge