merge of '53f259329d14afe6fe60b4952d59f0f5765e7d63'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:17 +0000 (16:20 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:17 +0000 (16:20 +0000)
commita23acd1215b40f360a6ad0bbebc1cc70e8317ee6
tree3bf6d6ddad3892a67c6e20cfa25a9a51cbe3e1dc
parentcfe60fe4a52699064cde1046462cc7f9b0db6595
parenteab392b728a3709e26f0f242e04200d18f0be60d
Merge ... '53f259329d14afe6fe60b4952d59f0f5765e7d63'
     and '9f53c3a657c02ddf15d8dc46c998112593d06aca'