merge of 'a96c9acac99b5599d2b0fb0a518603646414d166'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 15 Mar 2007 22:56:30 +0000 (22:56 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 15 Mar 2007 22:56:30 +0000 (22:56 +0000)
     and 'e8fe2283e0bda61a19e3e7f4cf561a638aa1b1fd'


Trivial merge