merge of 'ac4b5988727da1d0b584ac9a22c5fa12a864842f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 15:25:44 +0000 (15:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 15:25:44 +0000 (15:25 +0000)
     and 'e0fcc3e13cf457c4a58354625e80d7451ff357b7'


Trivial merge