merge of '7a5a4709034423139d7001ca7861c3d0ac73e140'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 14:14:45 +0000 (14:14 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 14:14:45 +0000 (14:14 +0000)
     and 'b0e1f4cc3e0bf1bed8a04464efb7be20824683fa'


Trivial merge