merge of '074f227db84b62ec3c531c61efcd62fc6b429dc3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 19 Dec 2007 10:02:27 +0000 (10:02 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 19 Dec 2007 10:02:27 +0000 (10:02 +0000)
commitc7e33ecf737e93f9ecec2cc609064bfd593f2b61
treea657ac69b5e38e1887286933e9ae748e2267b27b
parentef93660d2fbd162ca59457c96d7e1cea9cd8b907
parentf871fead79da276cf252c7a9ab1b33e33119b009
Merge ... '074f227db84b62ec3c531c61efcd62fc6b429dc3'
     and '5af64e0f29377b9ebbc655af469dd70d6a2f6dfb'