merge of '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 13:36:31 +0000 (13:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 13:36:31 +0000 (13:36 +0000)
     and '9ca4252efb9948ce173f616c937012398a0b2c42'


Trivial merge