merge of '1df6d041b2c60bf99f158bc629911c2bd43cb76b'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Dec 2006 13:03:25 +0000 (13:03 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Dec 2006 13:03:25 +0000 (13:03 +0000)
commit8997c7132b2f2c681a25869862787bbfcb2a1baf
tree7f15448c06eb96a1115fe9c1ae31e81c65822f39
parent378b7ec5b0c5dd38ec0d7d4e69c4078e6c22acca
parent4085ace5b4bea5cfbf73db10fdadc05b68108afa
Merge ... '1df6d041b2c60bf99f158bc629911c2bd43cb76b'
     and 'f5f0e13e97c221bdaa5281f17bf2ce322fc3ea4b'