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)
commitfed042ac19eabd57e0e26569dc35a74d4d8e6c31
tree15d2538c4d65a2c006035eff66be6bac6f3fde85
parent43c0c8f13c1b2bdecbd3315902d5951888f863b2
parenta4c96d20b0945e1bcab47041c919334ca49947b7
Merge ... '618bc57259adc999e3aa2e274184f51d0b2c25ff'
     and 'd3817d825e9b6c052e0da2a808abdcdb3a410892'