merge of 'ad0c1c90501edf142b7f2f658fe2c819ce9e0608'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 21 Dec 2007 08:24:03 +0000 (08:24 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 21 Dec 2007 08:24:03 +0000 (08:24 +0000)
     and 'd8704c548ce3f4b681847003a642608d26644766'


Trivial merge