merge of '08fdda9ff7a84b205b2fb4764177f2ce0fe9c95e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 Jan 2008 15:39:29 +0000 (15:39 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 Jan 2008 15:39:29 +0000 (15:39 +0000)
commitce7b82d842b8319ffba19c56af582b0e2c987492
tree9ab098a96b4cdda4d88ce51d8357f8c94a2e7c35
parentc13a77336c4ee422daa66b834567c058a93cd147
parent0651d8327b9411c69f23090f4acb13b65a6bd526
Merge ... '08fdda9ff7a84b205b2fb4764177f2ce0fe9c95e'
     and '17a4966f222ec6a5da1533bce5ce58143808be4a'