merge of '538b8a92adf30fc2607a93bc9b05dd896bd35712'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:45:34 +0000 (09:45 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:45:34 +0000 (09:45 +0000)
commit779aaacee4584c68b6aae20d84b0e315509e4768
tree73240f13faf7d5df0524588810430d35a4f53ad5
parent728fea9ef106410933e82cded8af7cc4bb31e1b6
parentc4100bfd5300f697a551e7bb8a33d8159f863fb0
Merge ... '538b8a92adf30fc2607a93bc9b05dd896bd35712'
     and '60b106c65d3e98f8aebfb8cdbf6947d4519b9798'