merge of '77bc506750c82f6a414e7c64c175cdaa3dd4b0d5'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 15:37:34 +0000 (15:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 15:37:34 +0000 (15:37 +0000)
     and '7d59915b6a6897fd24467fd539404f8354fe0fa9'


Trivial merge