merge of '2ea9f4ae40e1a9b07744e81b924d464d9e450aba'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Nov 2007 10:50:47 +0000 (10:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Nov 2007 10:50:47 +0000 (10:50 +0000)
     and 'be33ed116b217c668a13a0dae151271036541f73'


Trivial merge