merge of '44da8efcf85940e173cd83b2ea95fa7ae8782bb5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 31 Dec 2006 13:25:04 +0000 (13:25 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 31 Dec 2006 13:25:04 +0000 (13:25 +0000)
commitde9b02eb7296b392d3b9f52aa0f30c56fe6a6299
tree179895849d289c7a5cf08a55ff21afa74985a54d
parent51623a4e90bb2cfe64fee34ab42e9e65647d61a5
parentf907777709b20d8d73e3587026296a6616262229
Merge ... '44da8efcf85940e173cd83b2ea95fa7ae8782bb5'
     and 'ca1dbbdd8a20d72c6e8277b66f14e016ff7b8cc2'