merge of '4789fc4a55cdb58c5a1185215e671251be522827'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 10 Feb 2008 02:42:41 +0000 (02:42 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 10 Feb 2008 02:42:41 +0000 (02:42 +0000)
     and 'ce15bdbb89211863b43db8fc56de6aaf8a0dd4f7'


Trivial merge