merge of '9c656e60411087235cb8e41b6b3ae676447fa38a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Aug 2008 14:05:09 +0000 (14:05 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Aug 2008 14:05:09 +0000 (14:05 +0000)
commita64a639378fb0e511d30f3f8b29ce3df9eb3e709
treed23ff93e08e1ccbd4cae51e9eab88d9e5b9721c9
parent69dfcca0a7d3a310aac92d0d0941f04c9a7d7856
parent5f83ee8a351204c3de49dd2260263b184e096efe
Merge ... '9c656e60411087235cb8e41b6b3ae676447fa38a'
     and 'df7aebb70b0a281903694dd4a1221fae63e2c7b6'