merge of '509968e9aaa6b52420f7ae51e79fa781b449a633'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 May 2008 00:15:15 +0000 (00:15 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 May 2008 00:15:15 +0000 (00:15 +0000)
commit10950958becc16c3c1e59e0bb7ca2ebbbc41d222
treef0ba9f9189815327973e1d96a6cfa2e697348581
parent85fb5cceda2840375d857d65435b03be18cc1564
parent1eb0034152636b9945af02360af6ca8be131d671
Merge ... '509968e9aaa6b52420f7ae51e79fa781b449a633'
     and '5ffcacd9125004bbcb65a5f2d933272d313bee84'