merge of '469055299ae8d4097f672b0415b0cdd646bcc0f4'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 25 Apr 2008 01:40:56 +0000 (01:40 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 25 Apr 2008 01:40:56 +0000 (01:40 +0000)
     and '6ddfc49d6708e4afef01128cf539050c278991e3'


Trivial merge