merge of 'e7503adc20d2a854905f468365cd82066ebed0d5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 15:11:51 +0000 (15:11 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 15:11:51 +0000 (15:11 +0000)
commit50d6b833ffca8e8ae3fe477e4738a70726a39dbf
tree3410b165e640ad8d190e24341a779a8e67dab0cb
parent716fd1edbf1d83605e21ef5bd9411d5b4ca07b02
parent9922852899289409c04335fc9dd180bd98b9a2b2
Merge ... 'e7503adc20d2a854905f468365cd82066ebed0d5'
     and 'f380086d173615489f21da520bb5d47e43ad2e47'