merge of '37149b3d7b17d35e06e93ecd95c7eb36f4425da6'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 8 Jan 2008 02:07:12 +0000 (02:07 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 8 Jan 2008 02:07:12 +0000 (02:07 +0000)
     and '562c973381fd0816ab9bc3ab53a276a6c274c8b2'


Trivial merge