explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 18:03:31 +0000 (18:03 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 18:03:31 +0000 (18:03 +0000)
              and 'f2497299e919cb94e12fc8690a709479451e5510'


Trivial merge