merge of '120adbf5e1dc9921cc744af51e0b4877a60d7242'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 17:37:38 +0000 (17:37 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 17:37:38 +0000 (17:37 +0000)
     and 'bf1d58054d86a443b45c92dc8fbf509efb9fd64d'


Trivial merge