merge of '790c23e81c39839b0ba0595162a5ae757e670a1a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 9 Jan 2007 16:18:15 +0000 (16:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 9 Jan 2007 16:18:15 +0000 (16:18 +0000)
     and 'a9f18f9d995dd7166368f0f59d49307e5672b543'


Trivial merge