merge of '74c061404accba6de9e626ef3f093a8293209def'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 25 Aug 2008 15:23:47 +0000 (15:23 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 25 Aug 2008 15:23:47 +0000 (15:23 +0000)
     and 'af69f1d59affc73e1d3f65055a0ad0ff767a39e1'


Trivial merge