merge of '3522489c0311d58fd9ccb9e295ecac8a0a18fc21'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 7 Jun 2007 00:32:35 +0000 (00:32 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 7 Jun 2007 00:32:35 +0000 (00:32 +0000)
commit1571a7edea7968de3469e0763c27f3231a6fe553
tree06ca728b49aa0723737510eeab1cc52e065ace62
parent8e71775586c38ccb0d393fb6b06fcb573c072ce9
parent06009a026a3aed63e7bcf08daa88f6b0117318dd
Merge ... '3522489c0311d58fd9ccb9e295ecac8a0a18fc21'
     and '7ce845adf550b64d9d2250d29acf1667cf40a689'