merge of '790c23e81c39839b0ba0595162a5ae757e670a1a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 9 Jan 2007 16:18:15 +0000 (16:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 9 Jan 2007 16:18:15 +0000 (16:18 +0000)
commit2f95a718e6b8adad217c6e8bdf13d01d72cea4a9
tree8f30b7a3e39a8d4ee1b006c0641bcc91072654ab
parenta628fea265ca832735c99002474a4162f8fc9e59
parent9fd97ae2b9176b190227b4b668dcb45b76a3583e
Merge ... '790c23e81c39839b0ba0595162a5ae757e670a1a'
     and 'a9f18f9d995dd7166368f0f59d49307e5672b543'