merge of '33540f0bfe9c570bf5e5c1a8ef55968815395f11'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Mar 2007 12:09:42 +0000 (12:09 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Mar 2007 12:09:42 +0000 (12:09 +0000)
     and 'befbf7900e309702a3c2438dd7d214bd2cdbbb48'


Trivial merge