merge of '66ac81e5457735c2fdeaffebbea0e83ef0b97877'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 21:00:38 +0000 (21:00 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 21:00:38 +0000 (21:00 +0000)
commite38c46cff172df7934471ee397aa9b92729259c7
treee4d2f75592a5f78b519d15ae612137d91cc7c73f
parentdd4380869f19be2f69502c711938acef7bb350cc
parent2dbb9dbe3151d0b83c46c91cd7ea4b2c37d1fcd5
Merge ... '66ac81e5457735c2fdeaffebbea0e83ef0b97877'
     and 'f364e3e809950cf1c1059b61206516bd02506cf9'