merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 Jan 2008 13:19:04 +0000 (13:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 Jan 2008 13:19:04 +0000 (13:19 +0000)
     and '7c64c197c0b8e2b8661ee6bd11dbca6873ccb812'


Trivial merge