merge of 'b4bbcb9209b7d252256c7cf46056b31168ab9f98'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 13 Aug 2008 14:13:02 +0000 (14:13 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 13 Aug 2008 14:13:02 +0000 (14:13 +0000)
     and 'e299597d894e9e46f3a316b7baf5b542d23260d5'


Trivial merge