merge of '55dae195045d9fd52e41e970627ac6ef031ff672'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:09:34 +0000 (09:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:09:34 +0000 (09:09 +0000)
commit05f5c4d39c0688d428f44f6caf3cf4d580cbed74
tree9f2c03ad1978fe8c5b9cfa43209d03c32f3bbb2b
parent1841db4796e29019f252c5a34e1b989d993437bc
parent3f0daa3715c44b27daca990eea65bc90367dd0b2
Merge ... '55dae195045d9fd52e41e970627ac6ef031ff672'
     and '692eb13695fa8e30ad7f7f806b5de827575e917a'