merge of '4392736ce508627f703cfd1f8849601caf77f045'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 19 May 2008 12:33:08 +0000 (12:33 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 19 May 2008 12:33:08 +0000 (12:33 +0000)
     and 'fb05f74b0b5c179d6ed3f8897306c5563c223a50'


Trivial merge