merge of '22194037a32f6de23fd28a12aec379cb884388b7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Mar 2007 16:42:50 +0000 (16:42 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Mar 2007 16:42:50 +0000 (16:42 +0000)
commit560c374af9f04e871139d517e7cdda5c2f86f3b9
treef7ed4a56fb6eeeb5a391e6831bf4f6c3733cf24b
parent256bb57383358fcb670c5a04fffc3038cbf24ec4
parenta43af9311a7a5a6640c8c17294dd50f8db1eebe5
Merge ... '22194037a32f6de23fd28a12aec379cb884388b7'
     and 'b9293118c194a01c44b71ffff72e461a3fe86807'