merge of '57fa0ccbbdbca8c188108e3c4fbde4702976f3c6'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 29 Jun 2007 23:21:52 +0000 (23:21 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 29 Jun 2007 23:21:52 +0000 (23:21 +0000)
commit93d19714f8efa8413b63070f1c8a1e0ee5266131
tree6c954f87ddb0d396882b78dff7d7e5d8bc59efd3
parent4674b880ed6fad924653543ee16d6c55ec31c402
parenteb71ae6bd2cecdcd19127066387676a56331b32d
Merge ... '57fa0ccbbdbca8c188108e3c4fbde4702976f3c6'
     and 'b29b99ceeb63af04c2736ab8176705046dc326c0'