merge of '20692657869f7a733266d5313f4932a7ff336fb4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 25 Aug 2006 10:22:29 +0000 (10:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 25 Aug 2006 10:22:29 +0000 (10:22 +0000)
     and 'df229e8fdb521adfc364395363401a190529731c'


Trivial merge