merge of '033a134d8063d99bff7b1df1b0d14984874b7b2c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Dec 2006 12:12:34 +0000 (12:12 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Dec 2006 12:12:34 +0000 (12:12 +0000)
commitba78f0c9d4eeec88326869d3dd48aebe1cd32969
tree815ff992a52b30efddb58297d45511d5be442a37
parent7d22dec72b5d6a744038c2f7409071b9bc32dfb4
parent158f0623fd0ca282d25e72df9b4dcd12ef3e9bec
Merge ... '033a134d8063d99bff7b1df1b0d14984874b7b2c'
     and '2828d9465b54e6e0cd311dd4e9abd7f83eef4718'