merge of 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 25 Jul 2007 10:32:51 +0000 (10:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 25 Jul 2007 10:32:51 +0000 (10:32 +0000)
commit28954e831d14d9ee98416b8a0b39ff51db7d4d43
tree81b13e53d56d7e4665f93e6c5a8117f115627a46
parent9b7d152e6fd914b95c6559f16e0f302df2d70da5
parentb49cb416ed450da28047474fe3d7dc795fb22eb0
Merge ... 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
     and 'f963a995fb5f15bcaa6aa8a1ef6f5081ec15fa3b'