merge of 'a32f961c13d10e74ded721ccb9fe83cf7ca3af41'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 7 Aug 2007 13:08:18 +0000 (13:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 7 Aug 2007 13:08:18 +0000 (13:08 +0000)
     and 'a8f105d480857c488d8c43e2bcd2a1618c0040fa'


Trivial merge