merge of '618bc57259adc999e3aa2e274184f51d0b2c25ff'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Nov 2007 13:19:05 +0000 (13:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Nov 2007 13:19:05 +0000 (13:19 +0000)
     and 'd3817d825e9b6c052e0da2a808abdcdb3a410892'


Trivial merge