merge of '14d71b936216a80a0008bcd3d669f6c38fd5d0a6'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 03:40:10 +0000 (03:40 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 03:40:10 +0000 (03:40 +0000)
     and '79d9268d43556f55360ba162dc5f949422a1079b'


Trivial merge