merge of 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:34:35 +0000 (14:34 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:34:35 +0000 (14:34 +0000)
     and 'fc51ba6c6f78e661b51a328e391e78d3fa49d2d0'


Trivial merge