merge of '786f6df732a820a55dd0bd7dfcae2fceed17eb51'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 19 Mar 2007 12:06:18 +0000 (12:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 19 Mar 2007 12:06:18 +0000 (12:06 +0000)
commitbe64c5bc6b855e66885d541e80c15ee35e0d9848
tree760a339637eb3b05266081ec9e4bcdf32a31aeb6
parentb896db7df16e802793d5bd99e63757b502459da3
parent3cdbf0c0ca3a7d1079900550d7bf94ae9a380c54
Merge ... '786f6df732a820a55dd0bd7dfcae2fceed17eb51'
     and 'ebdd90a75ba631aac8cfe0075119597bd65de4cf'