merge of '03a6d73778554bdbea429845e2f717d7a2beb2f3'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 3 Jan 2008 01:00:42 +0000 (01:00 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 3 Jan 2008 01:00:42 +0000 (01:00 +0000)
     and 'de9cd407cd0ce372b951a6d6982f2d16a44dd95b'


Trivial merge