merge of '685f49aca74594ca1579d7481b11e07b315708e8'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 22:13:15 +0000 (22:13 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 22:13:15 +0000 (22:13 +0000)
commit4d37fa8011c7976226f659388384eebdb95cd73c
treeadc6504b0427a5d05ecb4654c984666234a4f7f7
parente4d2d33dd644948af495c450a250f4acf6bb4a3f
parent46a50544839a1c4243e258b499992da286b976bd
Merge ... '685f49aca74594ca1579d7481b11e07b315708e8'
     and 'fb386b14fd62e2255bdaaa1edca0a4ad6adf82c9'