merge of '42cb81c40550397bea69b71bcc8768f0b8b81476'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 31 Jul 2008 23:37:16 +0000 (23:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 31 Jul 2008 23:37:16 +0000 (23:37 +0000)
     and '8cb0572b0f44ef514300735efee6e6721ef539f1'


Trivial merge