merge of 'dce476bebffcc73b0e98cc7993b31d7ec990e0c1'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 10 May 2007 01:31:30 +0000 (01:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 10 May 2007 01:31:30 +0000 (01:31 +0000)
     and 'e667ba6374c25cdda7993fbe50ce37b3f590aedc'


Trivial merge