merge of 'c4d28a6e258d216337992f6758fd866e256c7b04'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 6 Dec 2006 01:31:07 +0000 (01:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 6 Dec 2006 01:31:07 +0000 (01:31 +0000)
commit87212b9bc9603e818c2fa262ca8113c462f8435b
tree3ca75661ce5eaf1a3d9dd88b826bfcfedc5d746d
parent84e2aa1a4f97429ee837fc59b7772bf7a2dfffd1
parent47b0daf560cac807c114ed8152c02b91a71207fd
Merge ... 'c4d28a6e258d216337992f6758fd866e256c7b04'
     and 'eedaf2390fb368f9b5895718bac44f753c8e25df'