merge of '2e4f188aff9f2db155896f2fc0669c515d2d86c3'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:36:28 +0000 (07:36 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:36:28 +0000 (07:36 +0000)
     and 'ba76f4856806d81e983ec7db3a011d59a30abf15'


Trivial merge