merge of '7d055c0af1800d25200ac6ecd4c27f7dbf792959'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 16:01:46 +0000 (16:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 16:01:46 +0000 (16:01 +0000)
commit19aab5d4726186afd94fed3afad876830a66d0dd
tree4239cb8067ace679f01513777f4f653e90bf4363
parent4bb292958ea6afe63213f5584ee8d6f5bada3b55
parent27d8cd2e371888816bdf126c373ee30edf6721e4
Merge ... '7d055c0af1800d25200ac6ecd4c27f7dbf792959'
     and '87fab946dd0ff671b8bdc6287b092c82e877af35'