merge of '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Apr 2008 13:14:46 +0000 (13:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Apr 2008 13:14:46 +0000 (13:14 +0000)
     and 'b96f9f2ce38832413116be9151b3f4213200e5ff'


Trivial merge