merge of '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 27 Aug 2008 15:37:19 +0000 (15:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 27 Aug 2008 15:37:19 +0000 (15:37 +0000)
     and '6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0'


Trivial merge