merge of '13530e1cbba5e3db86e8ea9713ffcf460f77b92c'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 1 Aug 2008 00:37:05 +0000 (00:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 1 Aug 2008 00:37:05 +0000 (00:37 +0000)
     and 'b70c18ddb17c1721c0c521628f96624b1a6bef2b'


Trivial merge