merge of '0725dca697debd47e527ba8545a1c2f3cded398f'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Jun 2007 15:30:53 +0000 (15:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Jun 2007 15:30:53 +0000 (15:30 +0000)
commit41efe7c2f1f2aa740512d5e011a729ea54050b90
treefb5ab57f2edbf362ad6fbe07368697e62a91ff78
parentccc80138e3e4f00ea7798eca403c460cd8a346a1
parent58850c44dcb286fae07369d6e91c90c5b33ba04e
Merge ... '0725dca697debd47e527ba8545a1c2f3cded398f'
     and '785af4fbee0bb0cddc82de7efab348482551f339'