merge of '31255ba5192f33ebbab0596e34dbb8754a1d6f5a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 28 May 2007 09:41:29 +0000 (09:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 28 May 2007 09:41:29 +0000 (09:41 +0000)
     and 'eb91cd3982ac95a5691bfcc1a9dc860004185f3d'


Trivial merge