merge of '3a8ccf83b6129aaf01b6c74434ca54cfb7e5decb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 23:41:00 +0000 (23:41 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 23:41:00 +0000 (23:41 +0000)
     and '41db577c3c375bd1d331db987173c324ab65bb47'


Trivial merge