merge of '351a1d2f8971414b26915d2d5c883576729b53f9'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 7 Apr 2007 06:31:31 +0000 (06:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 7 Apr 2007 06:31:31 +0000 (06:31 +0000)
commitd57ad0d30ce194627146ebb970493d6947a0a744
tree6c7e45a63eebf83755b9d0bb2a87fb0a627751c5
parenta80e9ebf17143da2f5c5349e1615068ac2032df2
parentfdc7fdcb290bc46bc52e2b5b40c0cf1b9fcac8b1
Merge ... '351a1d2f8971414b26915d2d5c883576729b53f9'
     and 'c6346a6de5d825ca4ddd2b7129cbcaeaf371c86a'