explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 18:03:31 +0000 (18:03 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 18:03:31 +0000 (18:03 +0000)
commit9fe0c139e1c937056b026e592083392fd7fa1944
treebafa4c981544943153ae38ea30c6de8a087d17bc
parentc15fef9716526f7433ba94ae2b43a400850e0445
parentb3140343fb3f60f802edcb7f636dd1e1d6b6ef77
explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'
              and 'f2497299e919cb94e12fc8690a709479451e5510'