merge of '7689fff9e1ccd863bef2d39ffbdb4808f5fe25f4'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:43:04 +0000 (07:43 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:43:04 +0000 (07:43 +0000)
     and 'f69d33ca84f78b23a444272f70d92f9de97b221f'


Trivial merge