merge of '88df3da823d2bce88856c558a8edb5e19f13c6dc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 15 Dec 2006 16:18:39 +0000 (16:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 15 Dec 2006 16:18:39 +0000 (16:18 +0000)
commit85db90bc0b87436273ac56d20959958d7bb980d2
treede4cd87e91c01b347c0732cb18bce235cca67691
parentd16bfb3af2fbc64f0a7d498b38ed357838c918a2
parenta72b91d8031e702c2d2f9d16ed1e2eec949cf2b7
Merge ... '88df3da823d2bce88856c558a8edb5e19f13c6dc'
     and 'b69e1fa3c948f1b457f68d8dafdae100280874ed'