merge of 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Mar 2007 18:06:15 +0000 (18:06 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Mar 2007 18:06:15 +0000 (18:06 +0000)
     and 'cf1509616612351c585abcb7745d78bb211e442f'


Trivial merge