merge of '42c1f8fc2e2320defc4c39f093a87c49b1af3656'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:22:30 +0000 (19:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:22:30 +0000 (19:22 +0000)
commit3ea488871cc35001503eeb2694859a5e40fbb2c1
treed5c64d9098ac5e982cba529828655e6aae5b1f16
parent13686edad2feafdbd1ad212f5a888f3141bb9887
parent5c44948c75ff5c783c66cacdc3f71341af49b58d
Merge ... '42c1f8fc2e2320defc4c39f093a87c49b1af3656'
     and 'a8c7b34eb970f67785d063b6597433fea669b5dd'