merge of '030e4469b1b9b06a2653e1b2c5a505fe0a234237'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 9 Jul 2007 23:50:17 +0000 (23:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 9 Jul 2007 23:50:17 +0000 (23:50 +0000)
     and '3ab017d5460e18f9bb41bc07ddc69e86c27508c6'


Trivial merge