merge of '7a5a4709034423139d7001ca7861c3d0ac73e140'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 14:14:45 +0000 (14:14 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 14:14:45 +0000 (14:14 +0000)
commit1a43f7bfb4c74b60df85ef0d681fd24adc22fe26
treee503acf5d75f3c50d085fec1ee4ad2a108cbef3e
parent8e148d8850646c085f55247d06eb1c5a09a56e85
parent0a080ee0fd673cc529dda6e9f464de6b011e58ca
Merge ... '7a5a4709034423139d7001ca7861c3d0ac73e140'
     and 'b0e1f4cc3e0bf1bed8a04464efb7be20824683fa'