merge of '08fdda9ff7a84b205b2fb4764177f2ce0fe9c95e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 Jan 2008 15:39:29 +0000 (15:39 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 Jan 2008 15:39:29 +0000 (15:39 +0000)
     and '17a4966f222ec6a5da1533bce5ce58143808be4a'


Trivial merge