merge of 'c4d28a6e258d216337992f6758fd866e256c7b04'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 6 Dec 2006 01:31:07 +0000 (01:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 6 Dec 2006 01:31:07 +0000 (01:31 +0000)
     and 'eedaf2390fb368f9b5895718bac44f753c8e25df'


Trivial merge