merge of '3a8ccf83b6129aaf01b6c74434ca54cfb7e5decb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 23:41:00 +0000 (23:41 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 23:41:00 +0000 (23:41 +0000)
commitf89d13471b4192b7d4193fa153b257c088b5c5a9
tree30bd0156174bfa1408e176b12fc52fcd58cd0b6b
parentf8f5662bc734df9318c4bcde172de3bcf4bdb989
parent8be48ef62d9285fae3ad99ea1b8d0a129e2372eb
Merge ... '3a8ccf83b6129aaf01b6c74434ca54cfb7e5decb'
     and '41db577c3c375bd1d331db987173c324ab65bb47'