merge of '818e2a75a7b401d665944a17d67a461550f70977'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Aug 2008 21:50:33 +0000 (21:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Aug 2008 21:50:33 +0000 (21:50 +0000)
     and 'cc7ffb8bc92349fabe61bdc5525f9ce9f58af9b6'


Trivial merge