merge of '8f81066c1bea85c3191ff30a0d721cd1a3ccc041'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 15 Jan 2007 20:46:52 +0000 (20:46 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 15 Jan 2007 20:46:52 +0000 (20:46 +0000)
commit127b5109e790172290734d282ed6b00f1e9a559c
tree75864f6f7df49d446a995440be17146ab46dc0d0
parent6eafd8a3f7ce813e5c2e33a606d2b2754d6aacb1
parentaef114162d66ed9f45e616b631701b988dc95137
Merge ... '8f81066c1bea85c3191ff30a0d721cd1a3ccc041'
     and '98ff999fc95d5b6c4cf5fd58a2c502aea38ea350'