merge of 'c1f56760bf109a8b713045831bca0044ccd1d481'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 9 Jan 2008 12:44:19 +0000 (12:44 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 9 Jan 2008 12:44:19 +0000 (12:44 +0000)
     and 'dfa87282df155f394e48f13dfb6785a4e617b0c3'


Trivial merge