merge of 'd186ad540510a4f04ab08186965e402582c0b260'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 6 Jul 2008 12:11:17 +0000 (12:11 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 6 Jul 2008 12:11:17 +0000 (12:11 +0000)
     and 'dabb7f768bbfa25e854f118a7221f3ec007f65ca'


Trivial merge