merge of '5d04d04dfc4ca490d4feb89775a2681116f3a403'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 00:44:08 +0000 (00:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 00:44:08 +0000 (00:44 +0000)
commit4de795b20197055f95dfea58893578951bf940a5
tree7503d133a15e607a2ad4400f97cea075dec6c454
parent28bc945bbd5340d58b3f299aa443d380619eb010
parent3bdb8ec7379bf1c34cb8e9f42aab247b9727f9a0
Merge ... '5d04d04dfc4ca490d4feb89775a2681116f3a403'
     and 'ef7b9f80525af0b2374045ede01ecc82e2b7cac8'