merge of '4989371c8e7cec943a964b459ec3e71c0f547204'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 Jan 2008 14:16:40 +0000 (14:16 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 Jan 2008 14:16:40 +0000 (14:16 +0000)
commit8e7bc75c1a94ae14a1af69fad0cc4e1fbb3f774e
tree9cd4d7fc6f57eaf4a77b8ebdb8390c7a687fe2bc
parent61fc2558227783fe8553783cf3cfbb3a2732577e
parentce0316fb54145e8006d623a837e0074bc06fa6ab
Merge ... '4989371c8e7cec943a964b459ec3e71c0f547204'
     and 'a541f884d07223a5c7e560a0e5732d213098f838'