merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 11:18:00 +0000 (11:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 11:18:00 +0000 (11:18 +0000)
commiteabaa88ffbd6d0125d31c629534614f3ede92b43
treeebb3845832061ec8e9bc757133e780e058516c9c
parent373c52d20c06479a59091293dbeb1cc22ed74dc4
parent5a1269e53c80708c3e3f53569791c66eab0cae12
Merge ... '740568b10a465e2c82673155e6c544f4bf1fd4c3'
     and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'