merge of '2a367b175831bc65ea08b04593fd5775fd3b35b8'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:06:04 +0000 (14:06 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:06:04 +0000 (14:06 +0000)
     and '3d6ef85ae2e8f4ef0940c85f75b4ba86dcb0266c'


Trivial merge