merge of '935bd334d12eb01cbbe72410106e2a4599e990fe'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 4 Sep 2008 15:28:17 +0000 (15:28 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 4 Sep 2008 15:28:17 +0000 (15:28 +0000)
     and 'f7ee95d38b46a158bafdfdbb83616e173d3577ec'


Trivial merge