explicit merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:49:17 +0000 (19:49 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:49:17 +0000 (19:49 +0000)
              and '94a69c171834b89089886081d5bd9f0e42d880f0'


Trivial merge