merge of '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:21:22 +0000 (19:21 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:21:22 +0000 (19:21 +0000)
commitbe846f1f60f21a11787bcb1b5469b948a1104c9a
tree5839973c5a465997f7e8f55f947d545e3bada012
parent1a43f7bfb4c74b60df85ef0d681fd24adc22fe26
parent90d0fadc3148a28f3f79b95f084f4cf6f0390d24
Merge ... '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'
     and 'aa846a6b8bb5f5b8232955a54e9391889948af52'