merge of '13300dbb95259891ffdb187402ac66a12e7f43c7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 17 Mar 2007 17:57:46 +0000 (17:57 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 17 Mar 2007 17:57:46 +0000 (17:57 +0000)
     and 'c18417178fcb2dac2e3931442dc1d0cf1ba2e5c8'


Trivial merge