merge of '47b76447b7c2487688f831149bc94872f6e96c44'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 22:23:34 +0000 (22:23 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 22:23:34 +0000 (22:23 +0000)
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'


Trivial merge