merge of '2516927691cb7bcdc148fa4797baf97a39ab6b0c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 11:56:55 +0000 (11:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 11:56:55 +0000 (11:56 +0000)
commitdb770b42eb37918178fe5bbb76435da607d80a7e
treeda5322fc755e1b7d5e7a84cdbf606163f36b9394
parent0333a386def212b512465eac557154ec6b4374ee
parentc9ff76a81726a5f3df0b702134374d8defba5e69
Merge ... '2516927691cb7bcdc148fa4797baf97a39ab6b0c'
     and 'e969264b78652c9f002dfe005ae2a8924f4aa450'