merge of '9ffaf3c87a0ed022e4d1a5278dd3fa333a996305'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:26:51 +0000 (11:26 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:26:51 +0000 (11:26 +0000)
commit9fbbb5505d79a4aa4acbba1e61898f5adcf00f85
tree5e3ce802f531fedad5a4a1732a47b81c714b8d92
parente84f95a18c4c6bc09fd6f870559278aeda9ea68e
parentec62aa75466f2fb6a63e85288915c2cfe82a1a90
Merge ... '9ffaf3c87a0ed022e4d1a5278dd3fa333a996305'
     and 'c6e16b4a6d0e111359e2359ddc437db8a41fbd3a'