merge of '0c3ffa597c3b4fb5490ca703af52bca72943bb4c'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:40:20 +0000 (07:40 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:40:20 +0000 (07:40 +0000)
     and 'a33eb17e4fab8b119709ca7c8430f47513a457d9'


Trivial merge