merge of '8379319d38f8d4256d9db6f6674dfbcedac57018'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 16 Feb 2008 15:08:48 +0000 (15:08 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 16 Feb 2008 15:08:48 +0000 (15:08 +0000)
     and 'c3619a54fb9a74b376346f54c6055df3e6a5e32d'


Trivial merge