merge of '350577dc9d50fd104cbe65fcdd6fc4ef3687461a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 11:55:35 +0000 (11:55 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 11:55:35 +0000 (11:55 +0000)
commit636a869f1346866f270aeebde248283bfa6a435a
tree8c438a3a87faeefecd61040368af4a0662f1d844
parentad775735ce8637c0fa2ff566300783575535a944
parentb4296f495d51cb12d34ff2c4e8c13354d6b209d3
Merge ... '350577dc9d50fd104cbe65fcdd6fc4ef3687461a'
     and 'f4212e83ebe4da66cf3e61254a93596210c1577d'