merge of '72e0f8e82cb9baa16d65f35517d48e96a34a0bf7'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 9 Feb 2008 02:44:23 +0000 (02:44 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 9 Feb 2008 02:44:23 +0000 (02:44 +0000)
     and 'b250ba17021e8536994dfe7df9782756f8801c14'


Trivial merge