merge of '47a018f2318445ba4e71d5969574adb98e48f062'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:20:42 +0000 (14:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:20:42 +0000 (14:20 +0000)
commit3b1747b9ce29a934e8acb9e25daac5191237f462
tree7cc37ad08ecea1477136b8013f41d5ba61ee5c26
parent2580c38251bb895f164adfdee448be48974d7b7c
parent1b8e1686cd6fc08555b441184364a71bc67e6068
Merge ... '47a018f2318445ba4e71d5969574adb98e48f062'
     and 'f6cc9b68982be345f6c9c58f1cc5894d7d878d10'