merge of '2a4827e0d2f1c33bb0ef3c1c3722a53d40a6795e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 17 Jun 2007 00:27:06 +0000 (00:27 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 17 Jun 2007 00:27:06 +0000 (00:27 +0000)
     and '8a9c646c76fe6bd1033098872e6a08b1376f0be9'


Trivial merge