merge of 'c46f8208c373d5560ddd45271e743c4c230bd2cd'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 May 2007 13:21:27 +0000 (13:21 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 May 2007 13:21:27 +0000 (13:21 +0000)
commit254997957ebd4c77f0a489e4259d5b13272dc18a
tree78197b074570fccc9ea8ee9eb077ac2c772bebce
parenta5b9c0a3c9a3d134d89d7c3f268b4aaab2f213f5
parent6bb2ac73d2204983830f51a73c7dc686860faf04
Merge ... 'c46f8208c373d5560ddd45271e743c4c230bd2cd'
     and 'f261cf941f77cd9c8da55b02b29790fe6ade119d'