merge of '29a8a8c7605ad9df4a27011f49bc1935e05c4b72'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 17:55:01 +0000 (17:55 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 17:55:01 +0000 (17:55 +0000)
     and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'


Trivial merge