merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 12:47:08 +0000 (12:47 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 12:47:08 +0000 (12:47 +0000)
commit8e34e63fa7dc47b94892503677dff3ddc188ffca
treec2bdf723f14cb6e98fd3ed021508b0300fd74176
parent19711ba264ecf5b93f70f73896608aca29cadeef
parent7a7ac89e3479c80a107f9363336567b29cd963bd
Merge ... '091511591b5d369f5f183c5300585f7f1b3ca830'
     and '3b98f460ed46650308bc3b880e26e161dd49d432'