merge of '479705830aaddad1ebb7bf7f36e492b5587043a0'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 11 Jan 2007 19:02:37 +0000 (19:02 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 11 Jan 2007 19:02:37 +0000 (19:02 +0000)
     and 'c4bca390acd8e11f41e5c2fa6f21837f7f6b70ae'


Trivial merge