merge of '4e038cbec73ce09bc146fb74f60b2c6d4359a29b'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 6 May 2007 16:09:44 +0000 (16:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 6 May 2007 16:09:44 +0000 (16:09 +0000)
commitcd1720fefd729bb1598d569442a17fb2054acc46
tree1cb5f724286cc608ad96a883121a5e40a16cef82
parent106b275a737d82c767dc18861b9c006db2e11ddd
parent33de73cb673b87938d734673c5fec3e5957250a7
Merge ... '4e038cbec73ce09bc146fb74f60b2c6d4359a29b'
     and '61b65ffb0a858399f89407df40b6469b203bda44'